Commit 2c5e4ae2 authored by Michael Niedermayer's avatar Michael Niedermayer

Revert "Merge commit 'db0a9432'"

This reverts commit d8082065, reversing
changes made to 30085bd4.

This is not needed

Requested-by: Marton Balint
parent 02b3ac87
...@@ -1688,9 +1688,6 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke ...@@ -1688,9 +1688,6 @@ 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