Merge commit '4895aa65'

* commit '4895aa65':
  libavformat: Allow calling av_write_trailer with a NULL AVIOContext

Conflicts:
	libavformat/mux.c

See: 277f20c3Merged-by: Michael Niedermayer <michaelni@gmx.at>