[FFmpeg-cvslog] Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'
Michael Niedermayer
git at videolan.org
Mon Mar 18 17:35:33 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 18 17:30:53 2013 +0100| [523c8e0503dcf99f67ea909dea2ca5e56d9ff091] | committer: Michael Niedermayer
Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'
* commit '50c449ac24fbb4c03c15d2e2026cef2204b80385':
iff: validate CMAP palette size
asfenc: return error on negative timestamp
Conflicts:
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=523c8e0503dcf99f67ea909dea2ca5e56d9ff091
---
More information about the ffmpeg-cvslog
mailing list