Commit 3a15168a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4895aa65'

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

Conflicts:
	libavformat/mux.c

See: 277f20c3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents edbbb114 4895aa65
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment