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

Merge commit '9cbf70fa' 


* commit '9cbf70fa':
  movenc: Write correct presentation timestamps in tfra

Conflicts:
	libavformat/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e2e36a73 9cbf70fa
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