[FFmpeg-cvslog] Merge commit '5d0450461ff729be5f531d333d29754155e406c5'
Michael Niedermayer
git at videolan.org
Thu Jan 10 12:56:29 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 12:52:02 2013 +0100| [56ca871fb3d6c60a97ac678a919d8253fcb3ebdd] | committer: Michael Niedermayer
Merge commit '5d0450461ff729be5f531d333d29754155e406c5'
* commit '5d0450461ff729be5f531d333d29754155e406c5':
idcin: better error handling
idcin: check for integer overflow when calling av_get_packet()
Conflicts:
libavformat/idcin.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56ca871fb3d6c60a97ac678a919d8253fcb3ebdd
---
More information about the ffmpeg-cvslog
mailing list