diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-01-03 12:49:12 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2008-01-03 12:49:12 +0000 |
| commit | 95c21842708ee36be60c1186bfb8d51d4129b368 (patch) | |
| tree | 5cb363a17f069c966b88c3537b430f64c0cbb4eb /libavformat | |
| parent | d80906e7b4a153fd98ee0b792de5324639efa913 (diff) | |
| download | ffmpeg-95c21842708ee36be60c1186bfb8d51d4129b368.tar.gz | |
Rationalize some dependencies between rtsp and rtp
Originally committed as revision 11385 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 |
2 files changed, 2 insertions, 2 deletions
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); |