Fix FFmpeg resync to release/1.1

I had missed some changes. Require to run make distclean & configure
MythTV · May 4, 2013 · 5f904a5 · 5f904a5
1 parent f9591cb
commit 5f904a5
Show file tree

Hide file tree

Showing 2 changed files with 273 additions and 252 deletions.
diff --git a/mythtv/external/FFmpeg/libavformat/Makefile b/mythtv/external/FFmpeg/libavformat/Makefile
@@ -220,7 +220,7 @@ OBJS-$(CONFIG_MPEG2VIDEO_MUXER)          += rawenc.o
 OBJS-$(CONFIG_MPEGPS_DEMUXER)            += mpeg.o
 OBJS-$(CONFIG_MPEGTSORIG_DEMUXER)        += mpegts.o isom.o
 OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts-mythtv.o isom.o
-OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o adtsenc.o
+OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
 OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += mpegvideodec.o rawdec.o
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
 OBJS-$(CONFIG_MPL2_DEMUXER)              += mpl2dec.o