[FFmpeg-cvslog] Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 01:28:53 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:19:35 2015 +0100| [324797eb83dff7708a464e2ff61dd1551cc5c058] | committer: Michael Niedermayer
Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4
* commit 'b9b689550e7531b1a2cc893d2af623e37f266936':
img2dec: check av_new_packet return value
Conflicts:
libavformat/img2dec.c
See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=324797eb83dff7708a464e2ff61dd1551cc5c058
---
More information about the ffmpeg-cvslog
mailing list