[FFmpeg-cvslog] Merge commit 'bfe18be88a66da25b60a091de6011197dcb231fd' into release/2.4
Michael Niedermayer
git at videolan.org
Sat Jan 17 23:06:56 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 23:00:16 2015 +0100| [05b1ac24709b4e6ccc96d6c41c14ef915110a868] | committer: Michael Niedermayer
Merge commit 'bfe18be88a66da25b60a091de6011197dcb231fd' into release/2.4
* commit 'bfe18be88a66da25b60a091de6011197dcb231fd':
mpeg4audio: check the init_get_bits() return value
Conflicts:
libavcodec/mpeg4audio.c
See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05b1ac24709b4e6ccc96d6c41c14ef915110a868
---
More information about the ffmpeg-cvslog
mailing list