[FFmpeg-devel] [PATCH 1/3] hwcontext: Do not call device_init again when deriving an existing device

[Mark Thompson]

On 15/05/18 01:42, mypopy at gmail.com wrote:
> 2018-05-15 5:58 GMT+08:00 Mark Thompson <sw at jkqxz.net>:
>> The change in 309d660775e2b47af6723a0477c4d753bc0c54f4 to call device_init
>> when doing derivation missed this case - we should only call it if we
>> actually made a new device.
>> ---
>>  libavutil/hwcontext.c | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
>> index 70c556ecac..745016ed7e 100644
>> --- a/libavutil/hwcontext.c
>> +++ b/libavutil/hwcontext.c
>> @@ -646,6 +646,9 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr,
>>                      ret = AVERROR(ENOMEM);
>>                      goto fail;
>>                  }
>> +                ret = av_hwdevice_ctx_init(dst_ref);
>> +                if (ret < 0)
>> +                    goto fail;
>>                  goto done;
>>              }
>>              if (ret != AVERROR(ENOSYS))
>> @@ -658,10 +661,6 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr,
>>      goto fail;
>>
>>  done:
>> -    ret = av_hwdevice_ctx_init(dst_ref);
>> -    if (ret < 0)
>> -        goto fail;
>> -
>>      *dst_ref_ptr = dst_ref;
>>      return 0;
>>
>> --
> Patchset LGTM, thanks.

Ok, I've applied 1 and 2.  I'll send a new version of 3 addressing other comments soon.

Thanks,

- Mark