[FFmpeg-cvslog] Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
Michael Niedermayer
git at videolan.org
Sat Dec 20 00:32:56 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 00:16:13 2014 +0100| [3a15168a6e9764f51d41d1e95ca1fc7386ade5ad] | committer: Michael Niedermayer
Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
* commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f':
libavformat: Allow calling av_write_trailer with a NULL AVIOContext
Conflicts:
libavformat/mux.c
See: 277f20c3c877a74aca9d480480024a6d66c9fbc4
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a15168a6e9764f51d41d1e95ca1fc7386ade5ad
---
More information about the ffmpeg-cvslog
mailing list