Commit fb85362b authored by lucabe's avatar lucabe

Split the RTP demuxing functions out of rtp.c, to simplify the RTP muxer's dependencies


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11406 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9e7adae7
...@@ -831,7 +831,7 @@ mp3_demuxer_deps="mpegaudio_parser" ...@@ -831,7 +831,7 @@ mp3_demuxer_deps="mpegaudio_parser"
oss_demuxer_deps_any="soundcard_h sys_soundcard_h" oss_demuxer_deps_any="soundcard_h sys_soundcard_h"
oss_muxer_deps_any="soundcard_h sys_soundcard_h" oss_muxer_deps_any="soundcard_h sys_soundcard_h"
redir_demuxer_deps="network" redir_demuxer_deps="network"
rtp_muxer_deps="network mpegts_demuxer rtp_protocol" rtp_muxer_deps="network rtp_protocol"
rtsp_demuxer_deps="sdp_demuxer" rtsp_demuxer_deps="sdp_demuxer"
sdp_demuxer_deps="rtp_protocol mpegts_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
v4l2_demuxer_deps="linux_videodev2_h" v4l2_demuxer_deps="linux_videodev2_h"
......
...@@ -121,9 +121,9 @@ OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o ...@@ -121,9 +121,9 @@ OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o
OBJS-$(CONFIG_RM_MUXER) += rmenc.o OBJS-$(CONFIG_RM_MUXER) += rmenc.o
OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.o OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.o
OBJS-$(CONFIG_ROQ_MUXER) += raw.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_RTP_MUXER) += rtp.o rtp_mpv.o rtp_aac.o
OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o
OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o rtp.o rtp_h264.o rtp_mpv.o rtp_aac.o OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o rtp.o rtpdec.o rtp_h264.o rtp_mpv.o rtp_aac.o
OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o
OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o
OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment