mirror of https://github.com/FFmpeg/FFmpeg.git
* commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f':
libavformat: Allow calling av_write_trailer with a NULL AVIOContext
Conflicts:
libavformat/mux.c
See: 277f20c3c8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/101/head
commit
3a15168a6e