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

Merge commit 'b3f04657' 


* commit 'b3f04657':
  segment: Fix the failure paths

Conflicts:
	libavformat/segment.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 86e7d20a b3f04657
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 7 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