Skip to content
Snippets Groups Projects
Commit dd78e109 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '1e46c63e' 


* commit '1e46c63e':
  avformat: refactor avformat_write_header

Conflicts:
	libavformat/mux.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6cbbf4a2 1e46c63e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 17 deletions
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