diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 16:49:56 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 16:49:56 +0300 |
| commit | 5242cc878a7ac471ab0a8c42bb8945f072765fd6 (patch) | |
| tree | cef13cece99336124560b175db07873ad5e20af9 /libavformat | |
| parent | 67ebc88fb5baaa0de25f22a9207868b3fc9296c2 (diff) | |
| parent | febfb49a70e82f5ac46dc7ea34dabd4d56b19b31 (diff) | |
Merge commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31'
* commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31':
matroskadec: Fix sample_aspect_ratio for stereo matroska content
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b77e7e8265..c5747492a0 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2063,7 +2063,7 @@ static int matroska_parse_tracks(AVFormatContext *s) if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { MatroskaTrackPlane *planes = track->operation.combine_planes.elem; - int display_width_mul = 1; + int display_width_mul = 1; int display_height_mul = 1; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; @@ -2078,7 +2078,7 @@ static int matroska_parse_tracks(AVFormatContext *s) av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, - st->codec->height * track->video.display_width * display_width_mul, + st->codec->height * track->video.display_width * display_width_mul, st->codec->width * track->video.display_height * display_height_mul, 255); if (st->codec->codec_id != AV_CODEC_ID_HEVC) |