avcodec/decode: remove ff_decode_bsfs_uninit()

It's been a wrapper for a simple av_bsf_free() call since c96904f525.

James Almer committed 6 years ago

Commit d3bedba1 parent 70faa9f3 files · +7 −10Browse files

Unified · Split

3 files

     return 0;
 fail:
-    ff_decode_bsfs_uninit(avctx);
+    av_bsf_free(&avci->bsf);
     return ret;
 }
     if (!avctx->refcounted_frames)
         av_frame_unref(avci->to_free);
 }
-void ff_decode_bsfs_uninit(AVCodecContext *avctx)
-{
-    av_bsf_free(&avctx->internal->bsf);
-}

  */
 int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt);
+/**
+ * Called during avcodec_open2() to initialize avctx->internal->bsf.
+ * The bsf should be freed with av_bsf_free().
+ */
 int ff_decode_bsfs_init(AVCodecContext *avctx);
-void ff_decode_bsfs_uninit(AVCodecContext *avctx);
 /**
  * Make sure avctx.hw_frames_ctx is set. If it's not set, the function will
  * try to allocate it from hw_device_ctx. If that is not possible, an error

@@ -1045,7 +1045,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 1044 unmodified lines
1045	av_packet_free(&avci->last_pkt_props);	1045	av_packet_free(&avci->last_pkt_props);
1046		1046
1047	av_packet_free(&avci->ds.in_pkt);	1047	av_packet_free(&avci->ds.in_pkt);
1048	ff_decode_bsfs_uninit(avctx);	1048	av_bsf_free(&avci->bsf);
1049		1049
1050	av_buffer_unref(&avci->pool);	1050	av_buffer_unref(&avci->pool);
1051	}	1051	}
@@ -1106,7 +1106,7 @@ av_cold int avcodec_close(AVCodecContext *avctx) · 54 unmodified lines
1106	avctx->hwaccel->uninit(avctx);	1106	avctx->hwaccel->uninit(avctx);
1107	av_freep(&avctx->internal->hwaccel_priv_data);	1107	av_freep(&avctx->internal->hwaccel_priv_data);
1108		1108
1109	ff_decode_bsfs_uninit(avctx);	1109	av_bsf_free(&avctx->internal->bsf);
1110		1110
1111	av_freep(&avctx->internal);	1111	av_freep(&avctx->internal);
1112	}	1112	}

Keyboard shortcuts