Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:12:52 +0000 (19:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:12:52 +0000 (19:12 +0200)
commit1c8c4b8a89b91c60b6c1687241e9cbf64e8949a5
tree83f5dc68a3945058c185e0ac1916181ea26f03d9
parente592bf3d2ff7280188d32ce1699b074917600e6d
parent865461099e062de5a3a109c2a5be98004c11d8bd
Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'

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

Conflicts:
libavformat/librtmp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/librtmp.c