[FFmpeg-cvslog] Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  6 19:12:52 2014 +0200| [1c8c4b8a89b91c60b6c1687241e9cbf64e8949a5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c8c4b8a89b91c60b6c1687241e9cbf64e8949a5
---