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

Merge commit 'df2aa222' 


* commit 'df2aa222':
  mov: Clarify tkhd flag settings

Conflicts:
	libavformat/movenc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4c915994 df2aa222
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 3 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