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

Merge commit '1d8a0c1b' 


* commit '1d8a0c1b':
  movenc: Allow to request not to use edit lists

Conflicts:
	libavformat/movenc.c

See: 537ef8be
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0d71e825 1d8a0c1b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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