summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-08-10 18:12:02 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-08-10 18:12:02 +0000
commit8306be9c3b62acb82b9f47474a7e8ed64134db68 (patch)
treeaee50bbd5e6b9c0639fb00bcd35c74648588a2d8 /libavformat/matroskadec.c
parent194d4b494b08ca7b715ca363e303e68cd75376de (diff)
matroskadec: disable h264 parser as long as it totally mess up frame type
Originally committed as revision 19622 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 068fcc17c3..25d7341514 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1376,6 +1376,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->height * track->video.display_width,
st->codec-> width * track->video.display_height,
255);
+ if (st->codec->codec_id != CODEC_ID_H264)
st->need_parsing = AVSTREAM_PARSE_HEADERS;
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
st->codec->codec_type = CODEC_TYPE_AUDIO;