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

Merge commit '86546109' 


* commit '86546109':
  librtmp: Don't free the temp url at the end of rtmp_open

Conflicts:
	libavformat/librtmp.c

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