# HG changeset patch
# User bcoudurier
# Date 1263423457 0
# Node ID fbedfacb36ed6facf483777b95cc63b6dc5e9333
# Parent  b0818d1328893ae45643c66656aa29f0be5bce9b
revert wrongly commited hunk in r21205

diff -r b0818d132889 -r fbedfacb36ed mpegtsenc.c
--- a/mpegtsenc.c	Wed Jan 13 22:52:22 2010 +0000
+++ b/mpegtsenc.c	Wed Jan 13 22:57:37 2010 +0000
@@ -196,8 +196,6 @@
                           data, q - data);
 }
 
-
-
 static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
 {
     //    MpegTSWrite *ts = s->priv_data;
@@ -242,10 +240,7 @@
             stream_type = STREAM_TYPE_AUDIO_AAC;
             break;
         case CODEC_ID_AC3:
-            if (!strcmp(s->oformat->name, "dvb"))
-                stream_type = STREAM_TYPE_PRIVATE_DATA;
-            else
-                stream_type = STREAM_TYPE_AUDIO_AC3;
+            stream_type = STREAM_TYPE_AUDIO_AC3;
             break;
         default:
             stream_type = STREAM_TYPE_PRIVATE_DATA;
@@ -891,17 +886,3 @@
     mpegts_write_packet,
     mpegts_write_end,
 };
-
-
-AVOutputFormat dvb_muxer = {
-    "dvb",
-    NULL_IF_CONFIG_SMALL("DVB style MPEG-2 transport stream format"),
-    "video/x-mpegts",
-    "dvb",
-    sizeof(MpegTSWrite),
-    CODEC_ID_MP2,
-    CODEC_ID_MPEG2VIDEO,
-    mpegts_write_header,
-    mpegts_write_packet,
-    mpegts_write_end,
-};