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

Merge commit '99e22b78' 


* commit '99e22b78':
  mov: Emit the correct tags for clcp tracks

Conflicts:
	libavformat/movenc.c

See: a5f6720f
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 944a744b 99e22b78
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 5 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