diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:26:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:27:10 +0200 |
| commit | 0054bbd6648318a2b1e6dd66adb38f5d3acb922d (patch) | |
| tree | f972334e1c8dcdba8ea9eaef6f372b23acf7ff2c /libavcodec/mpegvideo_xvmc.c | |
| parent | 42138f63574b77d5bccc22e711261cb6c82ed352 (diff) | |
| parent | ca36aa9e6b8f2fed15478245ad533fc594a35c37 (diff) | |
| download | ffmpeg-0054bbd6648318a2b1e6dd66adb38f5d3acb922d.tar.gz | |
Merge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'
* commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37':
codec_desc: set lossless attribute for SGI and DPX
Conflicts:
libavcodec/codec_desc.c
See: 5b802cf567a0ee7a2990e08d08f8aa0abffbb7d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_xvmc.c')
0 files changed, 0 insertions, 0 deletions