[FFmpeg-cvslog] Merge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' 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:18:49 2015 +0100| [298f7f1fac0bd3423188f113da875ebfb040bdc8] | committer: Michael Niedermayer
Merge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4
* commit '7c710c38f6481b892e01d3c1e4781ad160b2935e':
audiointerleave: check av_new_packet return value
Conflicts:
libavformat/audiointerleave.c
See: 3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=298f7f1fac0bd3423188f113da875ebfb040bdc8
---
More information about the ffmpeg-cvslog
mailing list