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