[FFmpeg-cvslog] Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
Michael Niedermayer
git at videolan.org
Fri Sep 27 12:19:45 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 27 12:13:41 2013 +0200| [72eddc10fa1f3ca7fb95292673fa26401f754c92] | committer: Michael Niedermayer
Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9':
lavf: Reset the entry count and allocation size variables on av_reallocp failures
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72eddc10fa1f3ca7fb95292673fa26401f754c92
---
More information about the ffmpeg-cvslog
mailing list