virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

revert wrongly commited hunk in r21205

Browse Source 
Originally committed as revision 21207 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2010-01-13 22:57:37 +00:00
parent 10061cd648
commit a1f42882e1
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/mpegtsenc.c
View File

@@ -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,
};