From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Dec 2014 23:16:13 +0000 (+0100)
Subject: Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
X-Git-Tag: n2.7-dev~1468
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/3a15168a6e9764f51d41d1e95ca1fc7386ade5ad

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@gmx.at>
---

3a15168a6e9764f51d41d1e95ca1fc7386ade5ad