[FFmpeg-cvslog] Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'
Michael Niedermayer
git at videolan.org
Mon Jan 7 01:15:22 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 7 01:11:14 2013 +0100| [4b20d307b32b3562b7cd595cd00dae30203a51fc] | committer: Michael Niedermayer
Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'
* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
indeo2: check decoding errors.
indeo2: return meaningful error codes
rl2: cosmetics, reformat
Conflicts:
libavcodec/rl2.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b20d307b32b3562b7cd595cd00dae30203a51fc
---
More information about the ffmpeg-cvslog
mailing list