From fa7af0a9bb9e513620ef1ecd3e21ae0fd7549930 Mon Sep 17 00:00:00 2001 From: Andrew Gallatin Date: Fri, 25 Jan 2013 10:59:25 -0500 Subject: Merge ffmpeg fix for sagetv recordings from upstream > commit c071b006436d663b977068f8d23cbc061f40491f > Author: Michael Niedermayer > Date: Mon Jan 21 04:21:56 2013 +0100 > > mpeg12demux: Fallback to startcode for stream type identification. > > Fixes Ticket2147 > Fixes SageTV support > > Based-on patch by Andrew Gallatin > Signed-off-by: Michael Niedermayer --- lib/ffmpeg/libavformat/mpeg.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/ffmpeg/libavformat/mpeg.c b/lib/ffmpeg/libavformat/mpeg.c index de2dd9dfbe..b9d2c78deb 100644 --- a/lib/ffmpeg/libavformat/mpeg.c +++ b/lib/ffmpeg/libavformat/mpeg.c @@ -453,7 +453,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 = CODEC_ID_MPEG2VIDEO; type = AVMEDIA_TYPE_VIDEO; @@ -476,9 +475,6 @@ static int mpegps_read_packet(AVFormatContext *s, } else if(es_type == STREAM_TYPE_AUDIO_AC3){ codec_id = 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]; -- cgit v1.2.3