diff --git a/mythtv/external/FFmpeg/libavformat/Makefile b/mythtv/external/FFmpeg/libavformat/Makefile
index 37a541b..ba69156 100644
--- a/mythtv/external/FFmpeg/libavformat/Makefile
+++ b/mythtv/external/FFmpeg/libavformat/Makefile
@@ -216,8 +216,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_MPEGTSORIG_DEMUXER)        += mpegts.o isom.o
-OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts-mythtv.o isom.o
+OBJS-$(CONFIG_MPEGTS_DEMUXER)        += mpegts.o isom.o
+#OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts-mythtv.o isom.o
 OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
 OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += mpegvideodec.o rawdec.o
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
diff --git a/mythtv/external/FFmpeg/libavformat/allformats.c b/mythtv/external/FFmpeg/libavformat/allformats.c
index 62141c2..698f151 100644
--- a/mythtv/external/FFmpeg/libavformat/allformats.c
+++ b/mythtv/external/FFmpeg/libavformat/allformats.c
@@ -166,11 +166,11 @@ void av_register_all(void)
     REGISTER_MUXER    (MPEG2VIDEO, mpeg2video);
     REGISTER_MUXER    (MPEG2VOB, mpeg2vob);
     REGISTER_DEMUXER  (MPEGPS, mpegps);
-//    REGISTER_MUXDEMUX (MPEGTS, mpegts);
+    REGISTER_MUXDEMUX (MPEGTS, mpegts);
     REGISTER_MUXER    (MPEGTS, mpegts);
-    REGISTER_DEMUXER  (MPEGTS, mythtv_mpegts);
-//    REGISTER_DEMUXER  (MPEGTSRAW, mpegtsraw);
-    REGISTER_DEMUXER  (MPEGTSRAW, mythtv_mpegtsraw);
+//    REGISTER_DEMUXER  (MPEGTS, mythtv_mpegts);
+    REGISTER_DEMUXER  (MPEGTSRAW, mpegtsraw);
+//    REGISTER_DEMUXER  (MPEGTSRAW, mythtv_mpegtsraw);
     REGISTER_DEMUXER  (MPEGVIDEO, mpegvideo);
     REGISTER_MUXER    (MPJPEG, mpjpeg);
     REGISTER_DEMUXER  (MSNWC_TCP, msnwc_tcp);
diff --git a/mythtv/external/FFmpeg/libavformat/mpegts.c b/mythtv/external/FFmpeg/libavformat/mpegts.c
index 37dde1f..788a59b 100644
--- a/mythtv/external/FFmpeg/libavformat/mpegts.c
+++ b/mythtv/external/FFmpeg/libavformat/mpegts.c
@@ -1283,7 +1283,7 @@ static void m4sl_cb(MpegTSFilter *filter, const uint8_t *section, int section_le
         av_free(mp4_descr[i].dec_config_descr);
 }

-int ff_old_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
+int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
                               const uint8_t **pp, const uint8_t *desc_list_end,
                               Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
                               MpegTSContext *ts)
@@ -1543,7 +1543,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
         if (desc_list_end > p_end)
             break;
         for(;;) {
-            if (ff_old_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p, desc_list_end,
+            if (ff_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p, desc_list_end,
                 mp4_descr, mp4_descr_count, pid, ts) < 0)
                 break;

@@ -2196,7 +2196,7 @@ static int64_t mpegts_get_dts(AVFormatContext *s, int stream_index,
 /**************************************************************/
 /* parsing functions - called from other demuxers such as RTP */

-MpegTSContext *ff_old_mpegts_parse_open(AVFormatContext *s)
+MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s)
 {
     MpegTSContext *ts;

@@ -2215,7 +2215,7 @@ MpegTSContext *ff_old_mpegts_parse_open(AVFormatContext *s)

 /* return the consumed length if a packet was output, or -1 if no
    packet is output */
-int ff_old_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
+int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
                         const uint8_t *buf, int len)
 {
     int len1;
@@ -2240,7 +2240,7 @@ int ff_old_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
     return len1 - len;
 }

-void ff_old_mpegts_parse_close(MpegTSContext *ts)
+void ff_mpegts_parse_close(MpegTSContext *ts)
 {
     int i;

@@ -2250,7 +2250,7 @@ void ff_old_mpegts_parse_close(MpegTSContext *ts)
 }

 AVInputFormat ff_mpegts_demuxer = {
-    .name           = "mpegts-ffmpeg",
+    .name           = "mpegts",
     .long_name      = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),
     .priv_data_size = sizeof(MpegTSContext),
     .read_probe     = mpegts_probe,
@@ -2262,7 +2262,7 @@ AVInputFormat ff_mpegts_demuxer = {
 };

 AVInputFormat ff_mpegtsraw_demuxer = {
-    .name           = "mpegtsraw-ffmpeg",
+    .name           = "mpegtsraw",
     .long_name      = NULL_IF_CONFIG_SMALL("raw MPEG-TS (MPEG-2 Transport Stream)"),
     .priv_data_size = sizeof(MpegTSContext),
     .read_header    = mpegts_read_header,
diff --git a/mythtv/external/FFmpeg/libavformat/utils-mythtv.c b/mythtv/external/FFmpeg/libavformat/utils-mythtv.c
index a35e6cc..d3a24d5 100644
--- a/mythtv/external/FFmpeg/libavformat/utils-mythtv.c
+++ b/mythtv/external/FFmpeg/libavformat/utils-mythtv.c
@@ -138,7 +138,7 @@ void av_remove_stream(AVFormatContext *s, int id, int remove_ts) {
             av_log(NULL, AV_LOG_DEBUG,
                    "av_remove_stream: mpegts_remove_stream\n");
             MpegTSContext *context = (MpegTSContext*) s->priv_data;
-            mpegts_remove_stream(context, id);
+//            mpegts_remove_stream(context, id);
         }
         changes = 1;
     }