remove useless declarations from mpegts.h
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Wed, 13 Jan 2010 22:50:26 +0000 (22:50 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Wed, 13 Jan 2010 22:50:26 +0000 (22:50 +0000)
Originally committed as revision 21205 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/mpegts.h
libavformat/mpegtsenc.c

index 7c4e73c..6887341 100644 (file)
 #define STREAM_TYPE_AUDIO_AC3       0x81
 #define STREAM_TYPE_AUDIO_DTS       0x8a
 
-typedef struct MpegTSContext MpegTSContext;
-
-MpegTSContext *mpegts_parse_open(AVFormatContext *s);
-int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
-                        const uint8_t *buf, int len);
-void mpegts_parse_close(MpegTSContext *ts);
-
 #endif /* AVFORMAT_MPEGTS_H */
index 9b12af7..21e92bf 100644 (file)
@@ -196,6 +196,8 @@ static void mpegts_write_pat(AVFormatContext *s)
                           data, q - data);
 }
 
+
+
 static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
 {
     //    MpegTSWrite *ts = s->priv_data;
@@ -240,7 +242,10 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
             stream_type = STREAM_TYPE_AUDIO_AAC;
             break;
         case CODEC_ID_AC3:
-            stream_type = STREAM_TYPE_AUDIO_AC3;
+            if (!strcmp(s->oformat->name, "dvb"))
+                stream_type = STREAM_TYPE_PRIVATE_DATA;
+            else
+                stream_type = STREAM_TYPE_AUDIO_AC3;
             break;
         default:
             stream_type = STREAM_TYPE_PRIVATE_DATA;
@@ -886,3 +891,17 @@ 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,
+};