[FFmpeg-cvslog] Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 00:16:13 2014 +0100| [fdc297bcf3741e5378ccec64cb0531e5bca38f09] | 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=fdc297bcf3741e5378ccec64cb0531e5bca38f09
---