Permalink
Browse files

Move MythTV's mpegts to mpegts-mythtv.c to make easier merges

Since our mpegts is so different from ffmpeg's and it's unlikely they will be
converging any time soon, I'm moving our version as a new demuxer, and with
the default name "mpegts" pointing at our version rather than ffmpeg's, which
will be available as "mpegts-ffmpeg".
  • Loading branch information...
Beirdo committed Apr 12, 2012
1 parent 0311ea8 commit b9ec51e519e63adfef2b97134fc0f0159a681e89
View
@@ -1817,6 +1817,7 @@ matroska_demuxer_suggest="zlib bzlib"
mov_demuxer_suggest="zlib"
mp3_demuxer_select="mpegaudio_parser"
mp4_muxer_select="mov_muxer"
+mpegtsorig_demuxer_select="mpegts_demuxer"
mpegtsraw_demuxer_select="mpegts_demuxer"
mxf_d10_muxer_select="mxf_muxer"
ogg_demuxer_select="golomb"
@@ -1832,7 +1833,7 @@ spdif_muxer_select="aac_parser"
tg2_muxer_select="mov_muxer"
tgp_muxer_select="mov_muxer"
w64_demuxer_deps="wav_demuxer"
-wtv_demuxer_deps="disable-borked"
+#wtv_demuxer_deps="disable-borked"
# indevs / outdevs
alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
@@ -2034,6 +2035,7 @@ test_deps _muxer _demuxer \
rm \
swf \
mpegts=ts \
+ mpegtsorig \
voc \
wav \
yuv4mpegpipe=yuv4mpeg \
@@ -172,7 +172,8 @@ OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o
OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o
-OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o isom.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_MPEGVIDEO_DEMUXER) += mpegvideodec.o rawdec.o
OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
@@ -154,7 +154,10 @@ void av_register_all(void)
REGISTER_MUXER (MPEG2VIDEO, mpeg2video);
REGISTER_MUXER (MPEG2VOB, mpeg2vob);
REGISTER_DEMUXER (MPEGPS, mpegps);
- REGISTER_MUXDEMUX (MPEGTS, mpegts);
+ REGISTER_MUXER (MPEGTS, mpegts);
+ REGISTER_DEMUXER (MPEGTS, mpegts);
+ REGISTER_DEMUXER (MPEGTS, mythtv_mpegts);
+ REGISTER_DEMUXER (MPEGTSRAW, mythtv_mpegtsraw);
REGISTER_DEMUXER (MPEGTSRAW, mpegtsraw);
REGISTER_DEMUXER (MPEGVIDEO, mpegvideo);
REGISTER_MUXER (MPJPEG, mpjpeg);
Oops, something went wrong.

0 comments on commit b9ec51e

Please sign in to comment.