[FFmpeg-cvslog] Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 01:18:24 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:09:57 2015 +0100| [749fadaa651e21540f3c86561be9be9f098ddb44] | committer: Michael Niedermayer
Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4
* commit '1551602b423755c4ed98c5b7b2c2d6504416726e':
nutdec: check av_new_packet return value
Conflicts:
libavformat/nutdec.c
See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=749fadaa651e21540f3c86561be9be9f098ddb44
---
More information about the ffmpeg-cvslog
mailing list