diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 19:47:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 19:47:58 +0200 |
| commit | 0c67ef272943c10decb9243c95fc209a7d3f2e12 (patch) | |
| tree | 2f31da67db1e439077fbef36257ff3a2d71d37e9 /libavcodec/aliaspixenc.c | |
| parent | e37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573 (diff) | |
| parent | 86a0432688216562926d4aee36118f01be6d5e1b (diff) | |
| download | ffmpeg-streaming-0c67ef272943c10decb9243c95fc209a7d3f2e12.zip ffmpeg-streaming-0c67ef272943c10decb9243c95fc209a7d3f2e12.tar.gz | |
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'
* commit '86a0432688216562926d4aee36118f01be6d5e1b':
Silicon Graphics Motion Video Compressor 1 & 2 decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h
See: 746b1dcc98b466e4abd301f304127583722ad80b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aliaspixenc.c')
0 files changed, 0 insertions, 0 deletions
