diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-01-13 22:57:37 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-01-13 22:57:37 +0000 |
| commit | a1f42882e191109175a428d588c773afaa44c516 (patch) | |
| tree | 38b2b7eebbb36f31622b7dffe3a6763590cb803f /libavformat | |
| parent | 10061cd6489eb42ad642e6902d8b3fffdcba1f17 (diff) | |
| download | ffmpeg-a1f42882e191109175a428d588c773afaa44c516.tar.gz | |
revert wrongly commited hunk in r21205
Originally committed as revision 21207 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegtsenc.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 21e92bf6b2..9b12af7ecb 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -196,8 +196,6 @@ static void mpegts_write_pat(AVFormatContext *s) 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(AVFormatContext *s, MpegTSService *service) 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, -}; |