From fc2580dc2aee2a7b86d3ca5428ce2e2e57c060b2 Mon Sep 17 00:00:00 2001 From: Johns Date: Thu, 8 Dec 2011 17:38:39 +0100 Subject: [PATCH] Use old aspect-ratio, make thread joinable. --- video.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/video.c b/video.c index 9bab2dc..f8dce63 100644 --- a/video.c +++ b/video.c @@ -2223,6 +2223,7 @@ static void VaapiRenderFrame(VaapiDecoder * decoder, } // update aspect ratio changes +#ifdef still_to_detect_define if (av_cmp_q(decoder->InputAspect, frame->sample_aspect_ratio)) { Debug(3, "video/vaapi: aspect ratio changed\n"); @@ -2231,6 +2232,16 @@ static void VaapiRenderFrame(VaapiDecoder * decoder, decoder->InputAspect = frame->sample_aspect_ratio; VaapiUpdateOutput(decoder); } +#else + if (av_cmp_q(decoder->InputAspect, frame->sample_aspect_ratio)) { + Debug(3, "video/vaapi: aspect ratio changed\n"); + + //decoder->InputWidth = video_ctx->width; + //decoder->InputHeight = video_ctx->height; + decoder->InputAspect = frame->sample_aspect_ratio; + VaapiUpdateOutput(decoder); + } +#endif if (VideoDeinterlace == VideoDeinterlaceSoftware && interlaced) { // FIXME: software deinterlace avpicture_deinterlace @@ -3170,7 +3181,7 @@ void VideoDisplayHandler(void) pthread_mutex_init(&VideoLockMutex, NULL); pthread_cond_init(&VideoWakeupCond, NULL); pthread_create(&VideoThread, NULL, VideoDisplayHandlerThread, NULL); - pthread_detach(VideoThread); + //pthread_detach(VideoThread); } }