aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ffmpeg/libavformat/mpeg.c4
1 files changed, 0 insertions, 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];