Index: configure
===================================================================
--- configure	(revision 31217)
+++ configure	(working copy)
@@ -252,6 +252,7 @@
   --enable-smb           enable Samba (SMB) input [autodetect]
   --enable-live          enable LIVE555 Streaming Media [autodetect]
   --enable-nemesi        enable Nemesi Streaming Media [autodetect]
+  --enable-librtmp       enable RTMPDump librtmp input [autodetect]
   --disable-vcd          disable VCD support [autodetect]
   --disable-dvdnav       disable libdvdnav [autodetect]
   --disable-dvdread      disable libdvdread [autodetect]
@@ -650,6 +651,7 @@
 _real=auto
 _live=auto
 _nemesi=auto
+_librtmp=auto
 _native_rtsp=yes
 _xinerama=auto
 _mga=auto
@@ -1063,6 +1065,8 @@
   --disable-live)       _live=no        ;;
   --enable-nemesi)      _nemesi=yes     ;;
   --disable-nemesi)     _nemesi=no      ;;
+  --enable-librtmp)     _librtmp=yes    ;;
+  --disable-librtmp)    _librtmp=no     ;;
   --enable-xinerama)    _xinerama=yes   ;;
   --disable-xinerama)   _xinerama=no    ;;
   --enable-mga)         _mga=yes        ;;
@@ -7190,6 +7194,24 @@
 fi
 echores "$_live"
 
+echocheck "RTMPDump RTMP support (librtmp)"
+if test "$_librtmp" = auto  && test "$_network" = yes ; then
+    _librtmp=no
+    if $_pkg_config --exists librtmp ; then
+        extra_cflags="$extra_cflags $($_pkg_config --cflags librtmp)"
+        extra_ldflags="$extra_ldflags $($_pkg_config --libs librtmp)"
+        _librtmp=yes
+    fi
+fi
+if test "$_librtmp" = yes && test "$_network" = yes; then
+    def_librtmp='#define CONFIG_LIBRTMP 1'
+    inputmodules="librtmp $inputmodules"
+else
+    _librtmp=no
+    def_librtmp='#undef CONFIG_LIBRTMP'
+    _noinputmodules="librtmp $_noinputmodules"
+fi
+echores "$_librtmp"
 
 echocheck "FFmpeg libavutil"
 if test "$_libavutil_a" = auto ; then
@@ -8716,7 +8738,7 @@
 
 $mak_hardcoded_tables
 $mak_libavcodec_mpegaudio_hp
-!CONFIG_LIBRTMP = yes
+CONFIG_LIBRTMP = $_librtmp
 
 CONFIG_BZLIB    = $bzlib
 CONFIG_ENCODERS = yes
@@ -9054,6 +9076,7 @@
 $def_inet6
 $def_inet_aton
 $def_inet_pton
+$def_librtmp
 $def_live
 $def_nemesi
 $def_network
@@ -9202,7 +9225,6 @@
 #define CONFIG_FFSERVER 0
 #define CONFIG_GPL 1
 #define CONFIG_GRAY 0
-#define CONFIG_LIBRTMP 0
 #define CONFIG_LIBVORBIS 0
 #define CONFIG_POWERPC_PERF 0
 #define CONFIG_SMALL 0