diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 04:21:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 17:10:23 +0100 |
| commit | c071b006436d663b977068f8d23cbc061f40491f (patch) | |
| tree | b58f2d235873b556322e1a2b066b78a3878fae72 /libavformat/mpeg.c | |
| parent | eb567a79990b5ce4c55d21e08cb19afc1cbfe42d (diff) | |
| download | ffmpeg-c071b006436d663b977068f8d23cbc061f40491f.tar.gz | |
mpeg12demux: Fallback to startcode for stream type identification.
Fixes Ticket2147
Fixes SageTV support
Based-on patch by Andrew Gallatin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 4af2057077..4eaffd8812 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -416,7 +416,6 @@ static int mpegps_read_packet(AVFormatContext *s, } es_type = m->psm_es_type[startcode & 0xff]; - if(es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){ if(es_type == STREAM_TYPE_VIDEO_MPEG1){ codec_id = AV_CODEC_ID_MPEG2VIDEO; type = AVMEDIA_TYPE_VIDEO; @@ -439,9 +438,6 @@ static int mpegps_read_packet(AVFormatContext *s, } else if(es_type == STREAM_TYPE_AUDIO_AC3){ codec_id = AV_CODEC_ID_AC3; type = AVMEDIA_TYPE_AUDIO; - } else { - goto skip; - } } else if (startcode >= 0x1e0 && startcode <= 0x1ef) { static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 }; unsigned char buf[8]; |