[FFmpeg-cvslog] r21207 - trunk/libavformat/mpegtsenc.c

[bcoudurier]

Author: bcoudurier
Date: Wed Jan 13 23:57:37 2010
New Revision: 21207

Log:
revert wrongly commited hunk in r21205

Modified:
   trunk/libavformat/mpegtsenc.c

Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c	Wed Jan 13 23:52:22 2010	(r21206)
+++ trunk/libavformat/mpegtsenc.c	Wed Jan 13 23:57:37 2010	(r21207)
@@ -196,8 +196,6 @@ static void mpegts_write_pat(AVFormatCon
                           data, q - data);
 }
 
-
-
 static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
 {
     //    MpegTSWrite *ts = s->priv_data;
@@ -242,10 +240,7 @@ static void mpegts_write_pmt(AVFormatCon
             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 @@ AVOutputFormat mpegts_muxer = {
     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,
-};