# HG changeset patch # User iive # Date 1329238242 0 # Node ID 0ef7177a063b0389baab76ad74ced444996831d5 # Parent 7a633f403051ac2845db054be70b351d446a44a5 Fix linking after FFmpeg merge. Protocols that are available only when librtmp is present are no longer disabled in the code, so we have to remove them in our configure. diff -r 7a633f403051 -r 0ef7177a063b configure --- a/configure Tue Feb 14 11:45:56 2012 +0000 +++ b/configure Tue Feb 14 16:50:42 2012 +0000 @@ -6702,6 +6702,7 @@ _librtmp=no def_librtmp='#define CONFIG_LIBRTMP 0' noinputmodules="librtmp $noinputmodules" + libavprotocols=$(echo $libavprotocols | sed -e s/RTMPE_PROTOCOL// -e s/RTMPS_PROTOCOL// -e s/RTMPT_PROTOCOL// -e s/RTMPTE_PROTOCOL// ) fi echores "$_librtmp"