Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-10 17:27:57 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-02-10 17:27:57 +0400
commit2c5e4ae29180aa325fd5bd84c37d4551ec884214 (patch)
tree5111a939c1dc19580b22c7e274c5dd19633a51d2 /ffplay.c
parent02b3ac87f81a614120c492b9df2b294d1c54755e (diff)
Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"
This reverts commit d80820655362645ae1c65d457287d7d12c04a44f, reversing changes made to 30085bd43e35acf931429dc445db5bc1869be022. This is not needed Requested-by: Marton Balint
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index 145e0452ad..d8dbe449f9 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);