Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'

* commit 'db0a943266be29ff0596872ebb418dfed75d00de':
  avplay: apply the stream sample_aspect_ratio to decoded video frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-10 12:47:02 +01:00
commit d808206553

View File

@ -1688,6 +1688,9 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
if (*pts == AV_NOPTS_VALUE) {
*pts = 0;
}
if (is->video_st->sample_aspect_ratio.num) {
frame->sample_aspect_ratio = is->video_st->sample_aspect_ratio;
}
if (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) {
SDL_LockMutex(is->pictq_mutex);