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

Merge commit '87a3ea31' 


* commit '87a3ea31':
  segment: Report the current media sequence

Conflicts:
	libavformat/segment.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f21f969a 87a3ea31
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 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