Commit 84dc7edc authored by bcoudurier's avatar bcoudurier

remove useless declarations from mpegts.h

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21205 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 663e0ace
...@@ -56,11 +56,4 @@ ...@@ -56,11 +56,4 @@
#define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_AC3 0x81
#define STREAM_TYPE_AUDIO_DTS 0x8a #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 */ #endif /* AVFORMAT_MPEGTS_H */
...@@ -196,6 +196,8 @@ static void mpegts_write_pat(AVFormatContext *s) ...@@ -196,6 +196,8 @@ static void mpegts_write_pat(AVFormatContext *s)
data, q - data); data, q - data);
} }
static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
{ {
// MpegTSWrite *ts = s->priv_data; // MpegTSWrite *ts = s->priv_data;
...@@ -240,6 +242,9 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) ...@@ -240,6 +242,9 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
stream_type = STREAM_TYPE_AUDIO_AAC; stream_type = STREAM_TYPE_AUDIO_AAC;
break; break;
case CODEC_ID_AC3: 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; break;
default: default:
...@@ -886,3 +891,17 @@ AVOutputFormat mpegts_muxer = { ...@@ -886,3 +891,17 @@ AVOutputFormat mpegts_muxer = {
mpegts_write_packet, mpegts_write_packet,
mpegts_write_end, 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,
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment