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

Merge commit 'c725faeb' 


* commit 'c725faeb':
  movenc: Use start_dts/cts instead of cluster[0] for writing edit lists

Conflicts:
	libavformat/movenc.c

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