Mercurial > libavformat.hg

comparison matroska.c @ 1920:8e7acf0111fe libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable pts reordering code and initialize a parser instead
author aurel
date Thu, 15 Mar 2007 23:08:58 +0000
parents 6901a6e6dd95
children 18891c1e3e46
comparison
equal deleted inserted replaced
1919:2b0dd64faa4b 1920:8e7acf0111fe
2285 tag = (p[1] << 8) | p[0]; 2285 tag = (p[1] << 8) | p[0];
2286 codec_id = codec_get_id(codec_wav_tags, tag); 2286 codec_id = codec_get_id(codec_wav_tags, tag);
2287 2287
2288 } 2288 }
2289 2289
2290 else if (codec_id == CODEC_ID_MPEG1VIDEO ||
2291 codec_id == CODEC_ID_MPEG2VIDEO ||
2292 codec_id == CODEC_ID_MPEG4 ||
2293 codec_id == CODEC_ID_MSMPEG4V3 ||
2294 codec_id == CODEC_ID_H264) {
2295 track->flags |= MATROSKA_TRACK_REORDER;
2296 }
2297
2298 else if (codec_id == CODEC_ID_AAC && !track->codec_priv_size) { 2290 else if (codec_id == CODEC_ID_AAC && !track->codec_priv_size) {
2299 MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track; 2291 MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track;
2300 int profile = matroska_aac_profile(track->codec_id); 2292 int profile = matroska_aac_profile(track->codec_id);
2301 int sri = matroska_aac_sri(audiotrack->internal_samplerate); 2293 int sri = matroska_aac_sri(audiotrack->internal_samplerate);
2302 extradata = av_malloc(5); 2294 extradata = av_malloc(5);
2386 av_reduce(&st->codec->sample_aspect_ratio.num, 2378 av_reduce(&st->codec->sample_aspect_ratio.num,
2387 &st->codec->sample_aspect_ratio.den, 2379 &st->codec->sample_aspect_ratio.den,
2388 st->codec->height * videotrack->display_width, 2380 st->codec->height * videotrack->display_width,
2389 st->codec-> width * videotrack->display_height, 2381 st->codec-> width * videotrack->display_height,
2390 255); 2382 255);
2383 st->need_parsing = 2;
2391 } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { 2384 } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
2392 MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *)track; 2385 MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *)track;
2393 2386
2394 st->codec->codec_type = CODEC_TYPE_AUDIO; 2387 st->codec->codec_type = CODEC_TYPE_AUDIO;
2395 st->codec->sample_rate = audiotrack->samplerate; 2388 st->codec->sample_rate = audiotrack->samplerate;