Revision f53ee312 libavformat/mov.c

View differences:

libavformat/mov.c
439 439
    const int den = get_be32(pb);
440 440
    AVStream * const st = c->fc->streams[c->fc->nb_streams-1];
441 441
    if (den != 0) {
442
        if ((st->sample_aspect_ratio.den && den != st->sample_aspect_ratio.den) ||
443
            (st->sample_aspect_ratio.num && num != st->sample_aspect_ratio.num))
442
        if ((st->sample_aspect_ratio.den != 1 || st->sample_aspect_ratio.num) && // default
443
            (den != st->sample_aspect_ratio.den || num != st->sample_aspect_ratio.num))
444 444
            av_log(c->fc, AV_LOG_WARNING,
445
                   "sample aspect ratio already set, overriding by 'pasp' atom\n");
445
                   "sample aspect ratio already set to %d:%d, overriding by 'pasp' atom\n",
446
                   st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
446 447
        st->sample_aspect_ratio.num = num;
447 448
        st->sample_aspect_ratio.den = den;
448 449
    }

Also available in: Unified diff