Mercurial > libavformat.hg

comparison asfdec.c @ 6484:29e95ae56fa9 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the corresponding AVMEDIA_TYPE_* symbols.
author stefano
date Sat, 25 Sep 2010 23:27:16 +0000
parents c59fad269e39
children
comparison
equal deleted inserted replaced
6483:ac299df18642 6484:29e95ae56fa9
637 st->codec->bit_rate = bitrate[i]; 637 st->codec->bit_rate = bitrate[i];
638 if (dar[i].num > 0 && dar[i].den > 0){ 638 if (dar[i].num > 0 && dar[i].den > 0){
639 av_reduce(&st->sample_aspect_ratio.num, 639 av_reduce(&st->sample_aspect_ratio.num,
640 &st->sample_aspect_ratio.den, 640 &st->sample_aspect_ratio.den,
641 dar[i].num, dar[i].den, INT_MAX); 641 dar[i].num, dar[i].den, INT_MAX);
642 } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==CODEC_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set. 642 } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set.
643 av_reduce(&st->sample_aspect_ratio.num, 643 av_reduce(&st->sample_aspect_ratio.num,
644 &st->sample_aspect_ratio.den, 644 &st->sample_aspect_ratio.den,
645 dar[0].num, dar[0].den, INT_MAX); 645 dar[0].num, dar[0].den, INT_MAX);
646 646
647 //av_log(s, AV_LOG_INFO, "i=%d, st->codec->codec_type:%d, dar %d:%d sar=%d:%d\n", i, st->codec->codec_type, dar[i].num, dar[i].den, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); 647 //av_log(s, AV_LOG_INFO, "i=%d, st->codec->codec_type:%d, dar %d:%d sar=%d:%d\n", i, st->codec->codec_type, dar[i].num, dar[i].den, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);