Permalink
Browse files

Fix FFmpeg resync to release/1.1

I had missed some changes.
Require to run make distclean & configure
  • Loading branch information...
jyavenard committed Apr 30, 2013
1 parent f9591cb commit 5f904a53d58c2977ca22ee7300617a2aeb58ed2e
Showing with 273 additions and 252 deletions.
  1. +1 −1 mythtv/external/FFmpeg/libavformat/Makefile
  2. +272 −251 mythtv/external/FFmpeg/libavformat/allformats.c
@@ -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
Oops, something went wrong.

0 comments on commit 5f904a5

Please sign in to comment.