[FFmpeg-cvslog] avcodec/vdpau: fix render2() check

Michael Niedermayer git at videolan.org
Mon Oct 6 16:32:28 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 16:23:36 2014 +0200| [0e57c051181c06d9a3468d5e072ded827ed09a53] | committer: Michael Niedermayer

avcodec/vdpau: fix render2() check

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e57c051181c06d9a3468d5e072ded827ed09a53
---

 libavcodec/vdpau.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index ec7effb..a760988 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -237,7 +237,7 @@ FF_DISABLE_DEPRECATION_WARNINGS
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
-    if (!hwctx->render) {
+    if (!hwctx->render && hwctx->render2) {
         status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info,
                                 pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
     } else



More information about the ffmpeg-cvslog mailing list