[FFmpeg-cvslog] Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"

Michael Niedermayer git at videolan.org
Sun Feb 10 14:34:23 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 14:27:57 2013 +0100| [2c5e4ae29180aa325fd5bd84c37d4551ec884214] | committer: Michael Niedermayer

Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"

This reverts commit d80820655362645ae1c65d457287d7d12c04a44f, reversing
changes made to 30085bd43e35acf931429dc445db5bc1869be022.

This is not needed

Requested-by: Marton Balint

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c5e4ae29180aa325fd5bd84c37d4551ec884214
---

 ffplay.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 145e045..d8dbe44 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1688,9 +1688,6 @@ 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);



More information about the ffmpeg-cvslog mailing list