[FFmpeg-cvslog] Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
Michael Niedermayer
git at videolan.org
Tue Feb 17 23:26:34 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 23:12:29 2015 +0100| [d128794fbc5eb5df9645d7e5fefc66abb3c701b5] | committer: Michael Niedermayer
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See: 2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d128794fbc5eb5df9645d7e5fefc66abb3c701b5
---
More information about the ffmpeg-cvslog
mailing list