avcodec: remove some references to avcodec_close

Signed-off-by: James Almer <jamrial@gmail.com>
release/7.0
James Almer 11 months ago
parent dc9d64f794
commit 81c2557691
  1. 2
      libavcodec/hwaccel_internal.h
  2. 2
      libavcodec/pthread_frame.c

@ -128,7 +128,7 @@ typedef struct FFHWAccel {
/** /**
* Uninitialize the hwaccel private data. * Uninitialize the hwaccel private data.
* *
* This will be called from get_format() or avcodec_close(), after hwaccel * This will be called from get_format() or ff_codec_close(), after hwaccel
* and hwaccel_context are already uninitialized. * and hwaccel_context are already uninitialized.
*/ */
int (*uninit)(AVCodecContext *avctx); int (*uninit)(AVCodecContext *avctx);

@ -761,7 +761,7 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
ff_pthread_free(fctx, thread_ctx_offsets); ff_pthread_free(fctx, thread_ctx_offsets);
/* if we have stashed hwaccel state, move it to the user-facing context, /* if we have stashed hwaccel state, move it to the user-facing context,
* so it will be freed in avcodec_close() */ * so it will be freed in ff_codec_close() */
av_assert0(!avctx->hwaccel); av_assert0(!avctx->hwaccel);
FFSWAP(const AVHWAccel*, avctx->hwaccel, fctx->stash_hwaccel); FFSWAP(const AVHWAccel*, avctx->hwaccel, fctx->stash_hwaccel);
FFSWAP(void*, avctx->hwaccel_context, fctx->stash_hwaccel_context); FFSWAP(void*, avctx->hwaccel_context, fctx->stash_hwaccel_context);

Loading…
Cancel
Save