summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--video/decode/vd_lavc.c2
-rw-r--r--waftools/fragments/cuda.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 5d3f77b746..ae79554edd 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -593,7 +593,7 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
if (ctx->hwdec_dev->restore_device)
ctx->hwdec_dev->restore_device(ctx->hwdec_dev);
if (!ctx->hwdec->set_hwframes) {
-#if HAVE_VDPAU_HWACCEL
+#if HAVE_VDPAU_HWACCEL || HAVE_CUDA_HWACCEL
avctx->hw_device_ctx = av_buffer_ref(ctx->hwdec_dev->av_device_ref);
#else
goto error;
diff --git a/waftools/fragments/cuda.c b/waftools/fragments/cuda.c
index c63ec2945d..1d534f62d3 100644
--- a/waftools/fragments/cuda.c
+++ b/waftools/fragments/cuda.c
@@ -2,11 +2,14 @@
typedef void * CUcontext;
+#include <libavcodec/avcodec.h>
#include <libavutil/hwcontext.h>
#include <libavutil/hwcontext_cuda.h>
int main(int argc, char *argv[]) {
enum AVHWDeviceType type = AV_HWDEVICE_TYPE_CUDA;
AVCUDADeviceContextInternal *foo;
+ AVCodecContext *avctx = avcodec_alloc_context3(NULL);
+ avctx->hw_device_ctx = NULL;
return 0;
}