Commit d8082065 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'db0a9432'

* commit 'db0a9432':
  avplay: apply the stream sample_aspect_ratio to decoded video frames
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 30085bd4 db0a9432
...@@ -1688,6 +1688,9 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke ...@@ -1688,6 +1688,9 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
if (*pts == AV_NOPTS_VALUE) { if (*pts == AV_NOPTS_VALUE) {
*pts = 0; *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)) { if (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) {
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment