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

Merge commit '28816050' 


* commit '28816050':
  lavf: Set the stream time base hint properly for chained muxers

Conflicts:
	libavformat/segment.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4db0e8fd 28816050
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