Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:16:13 +0000 (00:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:27:10 +0000 (00:27 +0100)
* 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>

Trivial merge