[FFmpeg-devel] [PATCH] avcodec/decode: remove ff_decode_bsfs_uninit()

[James Almer]

On 5/20/2020 9:34 PM, mypopy at gmail.com wrote:
> On Wed, May 20, 2020 at 12:08 PM James Almer <jamrial at gmail.com> wrote:
>>
>> It's been a wrapper for a simple av_bsf_free() call since c96904f525.
>>
>> Signed-off-by: James Almer <jamrial at gmail.com>
>> ---
>>  libavcodec/decode.c | 7 +------
>>  libavcodec/decode.h | 2 --
>>  libavcodec/utils.c  | 4 ++--
>>  3 files changed, 3 insertions(+), 10 deletions(-)
>>
>> diff --git a/libavcodec/decode.c b/libavcodec/decode.c
>> index 48a61d5419..f3327d74af 100644
>> --- a/libavcodec/decode.c
>> +++ b/libavcodec/decode.c
>> @@ -231,7 +231,7 @@ int ff_decode_bsfs_init(AVCodecContext *avctx)
>>
>>      return 0;
>>  fail:
>> -    ff_decode_bsfs_uninit(avctx);
>> +    av_bsf_free(&avci->bsf);
>>      return ret;
>>  }
>>
>> @@ -2005,8 +2005,3 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
>>      if (!avctx->refcounted_frames)
>>          av_frame_unref(avci->to_free);
>>  }
>> -
>> -void ff_decode_bsfs_uninit(AVCodecContext *avctx)
>> -{
>> -    av_bsf_free(&avctx->internal->bsf);
>> -}
>> diff --git a/libavcodec/decode.h b/libavcodec/decode.h
>> index c3e0e82f4c..0d69294def 100644
>> --- a/libavcodec/decode.h
>> +++ b/libavcodec/decode.h
>> @@ -66,8 +66,6 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt);
>>
>>  int ff_decode_bsfs_init(AVCodecContext *avctx);
> I think we better add a comment in the header if need to pairs using
> ff_decode_bsfs_init/av_bsf_free

Added a comment to ff_decode_bsfs_init() and pushed.