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

Merge commit 'a4903911' 


* commit 'a4903911':
  rtmpproto: Ignore errors from the getStreamLength method

Conflicts:
	libavformat/rtmpproto.c

See: 09711545
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 37425fcb a4903911
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment