Rationalize some dependencies between rtsp and rtp

Originally committed as revision 11385 to svn://svn.ffmpeg.org/ffmpeg/trunk

3 files changed, 5 insertions, 5 deletions

diff --git a/configure b/configure
index 0cc53f893a..a311af2281 100755
--- a/configure
+++ b/configure
@@ -831,9 +831,9 @@ mp3_demuxer_deps="mpegaudio_parser"
 oss_demuxer_deps_any="soundcard_h sys_soundcard_h"
 oss_muxer_deps_any="soundcard_h sys_soundcard_h"
 redir_demuxer_deps="network"
-rtp_muxer_deps="network mpegts_demuxer"
-rtsp_demuxer_deps="rtp_protocol rtp_muxer"
-sdp_demuxer_deps="rtsp_demuxer"
+rtp_muxer_deps="network mpegts_demuxer rtp_protocol"
+rtsp_demuxer_deps="sdp_demuxer"
+sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
 v4l2_demuxer_deps="linux_videodev2_h"
 v4l_demuxer_deps="linux_videodev_h"
 x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
diff --git a/libavformat/Makefile b/libavformat/Makefile
index b2ed240a1b..36fbaed235 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -123,7 +123,7 @@ OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.o
 OBJS-$(CONFIG_ROQ_MUXER)                 += raw.o
 OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o rtp_h264.o rtsp.o rtp_mpv.o rtp_aac.o
 OBJS-$(CONFIG_RTSP_DEMUXER)              += rtsp.o
-OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o
+OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o rtp.o rtp_h264.o rtp_mpv.o rtp_aac.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o
 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 611cde805f..5435dda681 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -137,7 +137,7 @@ void av_register_all(void)
     REGISTER_MUXER    (RTP, rtp);
     REGISTER_DEMUXER  (RTSP, rtsp);
     REGISTER_DEMUXER  (SDP, sdp);
-#ifdef CONFIG_RTP_MUXER
+#ifdef CONFIG_SDP_DEMUXER
     av_register_rtp_dynamic_payload_handlers();
 #endif
     REGISTER_DEMUXER  (SEGAFILM, segafilm);