comparison mov.c @ 5563:9baa7b82a840 libavformat

reindent
author bcoudurier
date Mon, 18 Jan 2010 23:58:10 +0000
parents 5d938dd16b34
children fc7b009926b5
comparison
equal deleted inserted replaced
5562:5d938dd16b34 5563:9baa7b82a840
1652 } else 1652 } else
1653 sc->pb = c->fc->pb; 1653 sc->pb = c->fc->pb;
1654 1654
1655 if (st->codec->codec_type == CODEC_TYPE_VIDEO) { 1655 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
1656 if (st->codec->width != sc->width || st->codec->height != sc->height) { 1656 if (st->codec->width != sc->width || st->codec->height != sc->height) {
1657 AVRational r = av_d2q(((double)st->codec->height * sc->width) / 1657 AVRational r = av_d2q(((double)st->codec->height * sc->width) /
1658 ((double)st->codec->width * sc->height), INT_MAX); 1658 ((double)st->codec->width * sc->height), INT_MAX);
1659 if (st->sample_aspect_ratio.num) 1659 if (st->sample_aspect_ratio.num)
1660 st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r); 1660 st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r);
1661 else 1661 else
1662 st->sample_aspect_ratio = r; 1662 st->sample_aspect_ratio = r;
1663 } 1663 }
1664 1664
1665 av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, 1665 av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
1666 sc->time_scale*st->nb_frames, st->duration, INT_MAX); 1666 sc->time_scale*st->nb_frames, st->duration, INT_MAX);
1667 } 1667 }