# HG changeset patch # User iive # Date 1329315645 0 # Node ID a073753233fe03313c16e89702f2ba4a86dff9c8 # Parent 3a11bcafd262bc76b93016d1969b6466e6a9c6e1 Fix linking after FFmpeg merge. This time the rtmp protocols that are available only with librtmp were renamed to librtmp* so we have to update the code that removes them in our configure. Added and the basic LIBRTMP one too. diff -r 3a11bcafd262 -r a073753233fe configure --- a/configure Tue Feb 14 20:23:02 2012 +0000 +++ b/configure Wed Feb 15 14:20:45 2012 +0000 @@ -6702,7 +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// ) + libavprotocols=$(echo $libavprotocols | sed -e s/LIBRTMP_PROTOCOL// -e s/LIBRTMPE_PROTOCOL// -e s/LIBRTMPS_PROTOCOL// -e s/LIBRTMPT_PROTOCOL// -e s/LIBRTMPTE_PROTOCOL// ) fi echores "$_librtmp"