comparison mov.c @ 6211:6f6ecca6904a libavformat

In mov demuxer, only set sar if not already set, patch by Andrew Wason, rectalogic at rectalogic dot com Fixes issue #1754

6210:da46dcc05d4a

                   dref->volume, dref->nlvl_from, dref->nlvl_to);
    } else
        sc->pb = c->fc->pb;

    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
        if (st->codec->width != sc->width || st->codec->height != sc->height) {
            AVRational r = av_d2q(((double)st->codec->height * sc->width) /
                                  ((double)st->codec->width * sc->height), INT_MAX);
            if (st->sample_aspect_ratio.num)
                st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r);
            else
                st->sample_aspect_ratio = r;
        }

        av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
                  sc->time_scale*st->nb_frames, st->duration, INT_MAX);
    }

6211:6f6ecca6904a

                   dref->volume, dref->nlvl_from, dref->nlvl_to);
    } else
        sc->pb = c->fc->pb;

    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
        if (!st->sample_aspect_ratio.num &&
            (st->codec->width != sc->width || st->codec->height != sc->height)) {
            st->sample_aspect_ratio = av_d2q(((double)st->codec->height * sc->width) /
                                             ((double)st->codec->width * sc->height), INT_MAX);
        }

        av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
                  sc->time_scale*st->nb_frames, st->duration, INT_MAX);
    }