virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

hwcontext: Do not call device_init again when deriving an existing device

Browse Source 
The change in 309d660775 to call device_init
when doing derivation missed this case - we should only call it if we
actually made a new device.
This commit is contained in:
Mark Thompson
2018-05-14 22:58:56 +01:00
parent 1b2471039b
commit 136260eb88
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/hwcontext.c
View File

@@ -646,6 +646,9 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr,
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
ret = av_hwdevice_ctx_init(dst_ref);
if (ret < 0)
goto fail;
goto done; goto done;
} }
if (ret != AVERROR(ENOSYS)) if (ret != AVERROR(ENOSYS))
@@ -658,10 +661,6 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr,
goto fail; goto fail;
done: done:
ret = av_hwdevice_ctx_init(dst_ref);
if (ret < 0)
goto fail;
*dst_ref_ptr = dst_ref; *dst_ref_ptr = dst_ref;
return 0; return 0;