Revision c9566115 libavformat/mov.c
| libavformat/mov.c | ||
|---|---|---|
| 925 | 925 |
st->codec->width = get_be16(pb); /* width */ |
| 926 | 926 |
st->codec->height = get_be16(pb); /* height */ |
| 927 | 927 |
|
| 928 |
if (st->codec->width != sc->width || st->codec->height != sc->height) {
|
|
| 929 |
AVRational r = av_d2q( |
|
| 930 |
((double)st->codec->height * sc->width) / |
|
| 931 |
((double)st->codec->width * sc->height), INT_MAX); |
|
| 932 |
if (st->sample_aspect_ratio.num) |
|
| 933 |
st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r); |
|
| 934 |
else |
|
| 935 |
st->sample_aspect_ratio = r; |
|
| 936 |
} |
|
| 937 |
|
|
| 938 | 928 |
get_be32(pb); /* horiz resolution */ |
| 939 | 929 |
get_be32(pb); /* vert resolution */ |
| 940 | 930 |
get_be32(pb); /* data size, always 0 */ |
| ... | ... | |
| 1662 | 1652 |
} else |
| 1663 | 1653 |
sc->pb = c->fc->pb; |
| 1664 | 1654 |
|
| 1655 |
if (st->codec->codec_type == CODEC_TYPE_VIDEO && |
|
| 1656 |
(st->codec->width != sc->width || st->codec->height != sc->height)) {
|
|
| 1657 |
AVRational r = av_d2q(((double)st->codec->height * sc->width) / |
|
| 1658 |
((double)st->codec->width * sc->height), INT_MAX); |
|
| 1659 |
if (st->sample_aspect_ratio.num) |
|
| 1660 |
st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r); |
|
| 1661 |
else |
|
| 1662 |
st->sample_aspect_ratio = r; |
|
| 1663 |
} |
|
| 1664 |
|
|
| 1665 | 1665 |
switch (st->codec->codec_id) {
|
| 1666 | 1666 |
#if CONFIG_H261_DECODER |
| 1667 | 1667 |
case CODEC_ID_H261: |
Also available in: Unified diff