Index: patched-ffmpeg-mt/libavformat/Makefile |
=================================================================== |
--- patched-ffmpeg-mt/libavformat/Makefile (revision 41250) |
+++ patched-ffmpeg-mt/libavformat/Makefile (working copy) |
@@ -20,7 +20,7 @@ |
OBJS-$(CONFIG_AC3_DEMUXER) += raw.o |
OBJS-$(CONFIG_AC3_MUXER) += raw.o |
OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o |
-OBJS-$(CONFIG_AEA_DEMUXER) += aea.o |
+OBJS-$(CONFIG_AEA_DEMUXER) += aea.o raw.o |
OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o riff.o raw.o |
OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o riff.o |
OBJS-$(CONFIG_AMR_DEMUXER) += amr.o |
@@ -35,8 +35,8 @@ |
OBJS-$(CONFIG_ASS_MUXER) += assenc.o |
OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o |
OBJS-$(CONFIG_AU_MUXER) += au.o |
-OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o |
-OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o |
+OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o avi.o |
+OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o avi.o |
OBJS-$(CONFIG_AVISYNTH) += avisynth.o |
OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o |
OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o |
@@ -126,7 +126,7 @@ |
OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o |
OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o |
OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o |
-OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o |
+OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o adtsenc.o |
OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o |
OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o |
OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o |
@@ -210,14 +210,16 @@ |
rtpenc_h264.o \ |
avc.o |
OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o |
+OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o |
OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o \ |
rdt.o \ |
rtp.o \ |
rtpdec.o \ |
+ rtpdec_amr.o \ |
+ rtpdec_asf.o \ |
rtpdec_h263.o \ |
- rtp_asf.o \ |
- rtp_h264.o \ |
- rtp_vorbis.o |
+ rtpdec_h264.o \ |
+ rtpdec_vorbis.o |
OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o |
OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o |
OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o |
@@ -249,7 +251,7 @@ |
OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o |
OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o |
OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o |
-OBJS-$(CONFIG_WV_DEMUXER) += wv.o |
+OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o id3v1.o |
OBJS-$(CONFIG_XA_DEMUXER) += xa.o |
OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o |
OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o |
@@ -269,6 +271,7 @@ |
OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o |
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o |
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o |
+OBJS-$(CONFIG_CONCAT_PROTOCOL) += concat.o |
# libavdevice dependencies |
OBJS-$(CONFIG_JACK_INDEV) += timefilter.o |