Mercurial > libavformat.hg
changeset 5541:79e17d3fdc9e libavformat
remove useless declarations from mpegts.h
| author | bcoudurier |
|---|---|
| date | Wed, 13 Jan 2010 22:50:26 +0000 |
| parents | 7828124f41d6 |
| children | b0818d132889 |
| files | mpegts.h mpegtsenc.c |
| diffstat | 2 files changed, 20 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegts.h Wed Jan 13 22:23:29 2010 +0000 +++ b/mpegts.h Wed Jan 13 22:50:26 2010 +0000 @@ -56,11 +56,4 @@ #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 */
--- a/mpegtsenc.c Wed Jan 13 22:23:29 2010 +0000 +++ b/mpegtsenc.c Wed Jan 13 22:50:26 2010 +0000 @@ -196,6 +196,8 @@ data, q - data); } + + static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) { // MpegTSWrite *ts = s->priv_data; @@ -240,7 +242,10 @@ 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 @@ 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, +};