Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:47:02 +0000 (12:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:47:37 +0000 (12:47 +0100)
* commit 'db0a943266be29ff0596872ebb418dfed75d00de':
  avplay: apply the stream sample_aspect_ratio to decoded video frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay.c

index d8dbe44..145e045 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -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);