-
Michael Niedermayer authored
* commit '86546109': librtmp: Don't free the temp url at the end of rtmp_open Conflicts: libavformat/librtmp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
1c8c4b8a
* commit '86546109': librtmp: Don't free the temp url at the end of rtmp_open Conflicts: libavformat/librtmp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>