Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Backport r24976 (Prefer the video aspect ratio provided by the context

over that provided by the stream) to release-0-23-fixes.


git-svn-id: http://svn.mythtv.org/svn/branches/release-0-23-fixes@25073 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
commit b4a4001ed7aca3f2df2253ad964691d1931c355d 1 parent ab64a9b
Mark Kendall authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 mythtv/libs/libmythtv/avformatdecoder.cpp
View
7 mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -1394,11 +1394,10 @@ void AvFormatDecoder::InitVideoCodec(AVStream *stream, AVCodecContext *enc,
{
fps = normalized_fps(stream, enc);
-
- if (stream->sample_aspect_ratio.num)
- aspect_ratio = av_q2d(stream->sample_aspect_ratio);
- else if (enc->sample_aspect_ratio.num)
+ if (enc->sample_aspect_ratio.num)
aspect_ratio = av_q2d(enc->sample_aspect_ratio);
+ else if (stream->sample_aspect_ratio.num)
+ aspect_ratio = av_q2d(stream->sample_aspect_ratio);
else
aspect_ratio = 1.0f;
Please sign in to comment.
Something went wrong with that request. Please try again.