summaryrefslogtreecommitdiff
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-03-15 23:08:58 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-03-15 23:08:58 +0000
commit262e2bee24194b88eba9e31edfc95ba3b39bc72f (patch)
tree10cf704a2849ca918721d44a9726ef3b3ed968e6 /libavformat/matroska.c
parentbaab295750befef8fe3f6a97aa4cca691ac24c75 (diff)
downloadffmpeg-262e2bee24194b88eba9e31edfc95ba3b39bc72f.tar.gz
disable pts reordering code and initialize a parser instead
Originally committed as revision 8418 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
-rw-r--r--libavformat/matroska.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 2f9f87f705..3e4b6e9778 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -2287,14 +2287,6 @@ matroska_read_header (AVFormatContext *s,
}
- else if (codec_id == CODEC_ID_MPEG1VIDEO ||
- codec_id == CODEC_ID_MPEG2VIDEO ||
- codec_id == CODEC_ID_MPEG4 ||
- codec_id == CODEC_ID_MSMPEG4V3 ||
- codec_id == CODEC_ID_H264) {
- track->flags |= MATROSKA_TRACK_REORDER;
- }
-
else if (codec_id == CODEC_ID_AAC && !track->codec_priv_size) {
MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track;
int profile = matroska_aac_profile(track->codec_id);
@@ -2388,6 +2380,7 @@ matroska_read_header (AVFormatContext *s,
st->codec->height * videotrack->display_width,
st->codec-> width * videotrack->display_height,
255);
+ st->need_parsing = 2;
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *)track;