]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/pthread_frame: fix setting hwaccel with threads and get_format()
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 17:51:49 +0000 (19:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 17:58:58 +0000 (19:58 +0200)
Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

Tested-by: oromit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pthread_frame.c

index 9e11038c525ba53045fc99314d8fabd31dfd46f5..2a67f4d2679119285fb7821fdc3f600485cfe02f 100644 (file)
@@ -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;