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

Merge commit '72f80161'


* commit '72f80161':
  movenc: Adjust edit lists to trim out parts of tracks with negative pts

Conflicts:
	libavformat/movenc.c

See: 66b45d8f
See: 14fd34d7
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5afe1233 72f80161
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment