diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2018-05-07 15:01:22 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2018-05-10 00:34:22 +0200 |
| commit | c85568342741e0e1b48fc36c780342de8ad29be7 (patch) | |
| tree | dea9adb3512522d1e25d98edaddfe61d95975cf9 /libavutil | |
| parent | baabd3c2adb0fd1234fd7756e0b1861233753a1e (diff) | |
| download | ffmpeg-c85568342741e0e1b48fc36c780342de8ad29be7.tar.gz | |
avutil/hwcontext_cuda: add CUstream in cuda hwctx
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/hwcontext_cuda.c | 3 | ||||
| -rw-r--r-- | libavutil/hwcontext_cuda.h | 1 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 5 insertions, 1 deletions
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, \ |