On 5/8/2018 3:36 PM, Timo Rothenpieler wrote: > --- > configure | 6 ++++-- > doc/APIchanges | 3 +++ > libavutil/hwcontext_cuda.c | 3 +++ > libavutil/hwcontext_cuda.h | 1 + > libavutil/version.h | 2 +- > 5 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index 6626111ff2..9743de05d0 100755 > --- a/configure > +++ b/configure > @@ -5887,8 +5887,10 @@ check_type "va/va.h va/va_enc_vp9.h" > "VAEncPictureParameterBufferVP9" > check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC" > > if ! disabled ffnvcodec; then > - check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.1" \ > - "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h > ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" > + check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.2" \ > + "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h > ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" || \ > + { test_pkg_config ffnvcodec_tmp "ffnvcodec < 8.1" "" "" && > check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.2" \ > + "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h > ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" ""; }
ffnvcodec_tmp? > fi > > check_cpp_condition winrt windows.h > "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" > diff --git a/doc/APIchanges b/doc/APIchanges > index ede5b186ae..bbefc8356e 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -15,6 +15,9 @@ libavutil: 2017-10-21 > > API changes, most recent first: > > +2018-05-xx - xxxxxxxxxx - lavu 56.18.101 - hwcontext_cuda.h > + Add AVCUDADeviceContext.stream. > + > 2018-04-xx - xxxxxxxxxx - lavu 56.18.100 - pixdesc.h > Add AV_PIX_FMT_FLAG_ALPHA to AV_PIX_FMT_PAL8. > > diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c > index 37827a770c..f3e81680e9 100644 > --- a/libavutil/hwcontext_cuda.c > +++ b/libavutil/hwcontext_cuda.c > @@ -386,6 +386,9 @@ static int cuda_device_create(AVHWDeviceContext *ctx, > const char *device, > goto error; > } > > + // Setting stream to NULL will make functions automatically use the > default CUstream > + hwctx->stream = NULL; > + > cu->cuCtxPopCurrent(&dummy); > > hwctx->internal->is_allocated = 1; > diff --git a/libavutil/hwcontext_cuda.h b/libavutil/hwcontext_cuda.h > index 12dae8449e..81a0552cab 100644 > --- a/libavutil/hwcontext_cuda.h > +++ b/libavutil/hwcontext_cuda.h > @@ -41,6 +41,7 @@ typedef struct AVCUDADeviceContextInternal > AVCUDADeviceContextInternal; > */ > typedef struct AVCUDADeviceContext { > CUcontext cuda_ctx; > + CUstream stream; > AVCUDADeviceContextInternal *internal; > } AVCUDADeviceContext; > > diff --git a/libavutil/version.h b/libavutil/version.h > index 5185454d9b..186fe0794d 100644 > --- a/libavutil/version.h > +++ b/libavutil/version.h > @@ -80,7 +80,7 @@ > > #define LIBAVUTIL_VERSION_MAJOR 56 > #define LIBAVUTIL_VERSION_MINOR 18 > -#define LIBAVUTIL_VERSION_MICRO 100 > +#define LIBAVUTIL_VERSION_MICRO 101 > > #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ > LIBAVUTIL_VERSION_MINOR, \ > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel