summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-09 19:51:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-09 19:58:58 +0200
commite36916a63f6fd0644461ecbd6b08eeb8dfab60ab (patch)
tree67e1b64de2c9c7b3b8aa356ac16476aa0f3655c9
parent31d49db75eea2032f1929b5c0bccc2b9c39e2006 (diff)
downloadffmpeg-streaming-e36916a63f6fd0644461ecbd6b08eeb8dfab60ab.zip
ffmpeg-streaming-e36916a63f6fd0644461ecbd6b08eeb8dfab60ab.tar.gz
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 <michaelni@gmx.at>
-rw-r--r--libavcodec/pthread_frame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 9e11038..2a67f4d 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;
OpenPOWER on IntegriCloud