[FFmpeg-cvslog] Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'
Michael Niedermayer
git at videolan.org
Mon Oct 28 12:15:23 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 12:07:23 2013 +0100| [a66ee3dc87c5650016df7dcd00c4ce0202f0c3ce] | committer: Michael Niedermayer
Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'
* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185':
h263: Check init_get_bits return value
Conflicts:
libavcodec/h263dec.c
See: d47e14b53a3908e5bad82e22129bbd175b49e89b
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a66ee3dc87c5650016df7dcd00c4ce0202f0c3ce
---
More information about the ffmpeg-cvslog
mailing list