[FFmpeg-cvslog] Merge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'
Michael Niedermayer
git at videolan.org
Tue Apr 1 03:28:34 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 1 03:26:40 2014 +0200| [0054bbd6648318a2b1e6dd66adb38f5d3acb922d] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0054bbd6648318a2b1e6dd66adb38f5d3acb922d
---
More information about the ffmpeg-cvslog
mailing list