generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rationalize some dependencies between rtsp and rtp

Browse Source 
Originally committed as revision 11385 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2008-01-03 12:49:12 +00:00
parent d80906e7b4
commit 95c2184270
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -831,9 +831,9 @@ 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_muxer_deps="network mpegts_demuxer rtp_protocol"
rtsp_demuxer_deps="rtp_protocol rtp_muxer" rtsp_demuxer_deps="sdp_demuxer"
sdp_demuxer_deps="rtsp_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
v4l2_demuxer_deps="linux_videodev2_h" v4l2_demuxer_deps="linux_videodev2_h"
v4l_demuxer_deps="linux_videodev_h" v4l_demuxer_deps="linux_videodev_h"
x11_grab_device_demuxer_deps="x11grab XShmCreateImage" x11_grab_device_demuxer_deps="x11grab XShmCreateImage"

2
libavformat/Makefile
View File

@ -123,7 +123,7 @@ 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_h264.o rtsp.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 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_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

2
libavformat/allformats.c
View File

@ -137,7 +137,7 @@ void av_register_all(void)
REGISTER_MUXER (RTP, rtp); REGISTER_MUXER (RTP, rtp);
REGISTER_DEMUXER (RTSP, rtsp); REGISTER_DEMUXER (RTSP, rtsp);
REGISTER_DEMUXER (SDP, sdp); REGISTER_DEMUXER (SDP, sdp);
#ifdef CONFIG_RTP_MUXER #ifdef CONFIG_SDP_DEMUXER
av_register_rtp_dynamic_payload_handlers(); av_register_rtp_dynamic_payload_handlers();
#endif #endif
REGISTER_DEMUXER (SEGAFILM, segafilm); REGISTER_DEMUXER (SEGAFILM, segafilm);