From e36916a63f6fd0644461ecbd6b08eeb8dfab60ab Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 9 Jul 2014 19:51:49 +0200 Subject: [PATCH] avcodec/pthread_frame: fix setting hwaccel with threads and get_format() Fixes assertion failure with vdpau and vlc Fixes Ticket3742 Tested-by: oromit Signed-off-by: Michael Niedermayer --- libavcodec/pthread_frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 9e11038c52..2a67f4d267 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -376,7 +376,7 @@ FF_ENABLE_DEPRECATION_WARNINGS p->result = ff_get_buffer(p->avctx, p->requested_frame, p->requested_flags); break; case STATE_GET_FORMAT: - p->result_format = p->avctx->get_format(p->avctx, p->available_formats); + p->result_format = ff_get_format(p->avctx, p->available_formats); break; default: call_done = 0;