[FFmpeg-cvslog] Merge commit 'aec50f79e7460340a148a3096fe212d67edc2c64'
Michael Niedermayer
git at videolan.org
Tue Jan 29 14:18:32 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 29 14:10:11 2013 +0100| [31d8d61f590ef6ebc22607d891158fc418c796a7] | committer: Michael Niedermayer
Merge commit 'aec50f79e7460340a148a3096fe212d67edc2c64'
* commit 'aec50f79e7460340a148a3096fe212d67edc2c64':
rawdec: use AVPALETTE_SIZE instead of magic constants.
mimic: remove a pointless cast.
mdec: return meaningful error codes.
Conflicts:
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31d8d61f590ef6ebc22607d891158fc418c796a7
---
More information about the ffmpeg-cvslog
mailing list