Merge commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:49:56 +0000 (14:49 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:49:56 +0000 (14:49 +0100)
* commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31':
  matroskadec: Fix sample_aspect_ratio for stereo matroska content

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/matroskadec.c

@@@ -2062,8 -1835,7 +2062,8 @@@ static int matroska_parse_tracks(AVForm
          }
  
          if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
-             int display_width_mul = 1;
 +            MatroskaTrackPlane *planes = track->operation.combine_planes.elem;
+             int display_width_mul  = 1;
              int display_height_mul = 1;
  
              st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
  
              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_H264 &&
 -                st->codec->codec_id != AV_CODEC_ID_HEVC)
 +            if (st->codec->codec_id != AV_CODEC_ID_HEVC)
                  st->need_parsing = AVSTREAM_PARSE_HEADERS;
 +
              if (track->default_duration) {
                  av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
                            1000000000, track->default_duration, 30000);