Mercurial > libavformat.hg

comparison utils.c @ 1611:cab8434bfeab libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert regression test breaking change
author michael
date Mon, 01 Jan 2007 21:17:14 +0000
parents 70ce246379b5
children dfe8b8bd6833
comparison
equal deleted inserted replaced
1610:cde17266ad08 1611:cab8434bfeab
1958 st = ic->streams[i]; 1958 st = ic->streams[i];
1959 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { 1959 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
1960 if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_sample) 1960 if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_sample)
1961 st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); 1961 st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
1962 1962
1963 if(duration_count[i]>1 1963 if(1
1964 && (st->codec->time_base.num*101LL <= st->codec->time_base.den || st->codec->codec_id == CODEC_ID_MPEG2VIDEO) /*&& 1964 && (st->codec->time_base.num*101LL <= st->codec->time_base.den || st->codec->codec_id == CODEC_ID_MPEG2VIDEO) /*&&
1965 //FIXME we should not special case mpeg2, but this needs testing with non mpeg2 ... 1965 //FIXME we should not special case mpeg2, but this needs testing with non mpeg2 ...
1966 st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den*/){ 1966 st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den*/){
1967 double best_error= 2*av_q2d(st->time_base); 1967 double best_error= 2*av_q2d(st->time_base);
1968 best_error= best_error*best_error*duration_count[i]*1000*12*30; 1968 best_error= best_error*best_error*duration_count[i]*1000*12*30;