lavc: deprecate avcodec_close()

Its use has been discouraged since 2016, but now is no longer used in avformat, so there is no reason to keep it public.

Anton Khirnov committed 2 years ago

Commit 1cc24d71 parent ca18bb56 files · +21 −7Browse files

Unified · Split

6 files

     return ret;
 free_and_end:
-    avcodec_close(avctx);
+    ff_codec_close(avctx);
     goto end;
 }
     memset(sub, 0, sizeof(*sub));
 }
-av_cold int avcodec_close(AVCodecContext *avctx)
+av_cold void ff_codec_close(AVCodecContext *avctx)
 {
     int i;
     if (!avctx)
-        return 0;
+        return;
     if (avcodec_is_open(avctx)) {
         AVCodecInternal *avci = avctx->internal;
     avctx->codec = NULL;
     avctx->active_thread_type = 0;
+}
+#if FF_API_AVCODEC_CLOSE
+int avcodec_close(AVCodecContext *avctx)
+{
+    ff_codec_close(avctx);
     return 0;
 }
+#endif
 static const char *unknown_if_null(const char *str)
 {

  */
 int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
+#if FF_API_AVCODEC_CLOSE
 /**
  * Close a given AVCodecContext and free all the data associated with it
  * (but not the AVCodecContext itself).
  * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
  * codec. Subsequent calls will do nothing.
  *
- * @note Do not use this function. Use avcodec_free_context() to destroy a
+ * @deprecated Do not use this function. Use avcodec_free_context() to destroy a
  * codec context (either open or closed). Opening and closing a codec context
  * multiple times is not supported anymore -- use multiple codec contexts
  * instead.
  */
+attribute_deprecated
 int avcodec_close(AVCodecContext *avctx);
+#endif
 /**
  * Free all allocated data in the given subtitle struct.

@@ -56,4 +56,6 @@ void ff_encode_flush_buffers(struct AVCodecContext *avctx); · 55 unmodified lines
56	struct AVCodecInternal *ff_decode_internal_alloc(void);	56	struct AVCodecInternal *ff_decode_internal_alloc(void);
57	struct AVCodecInternal *ff_encode_internal_alloc(void);	57	struct AVCodecInternal *ff_encode_internal_alloc(void);
58		58
		59	void ff_codec_close(struct AVCodecContext *avctx);
		60
59	#endif // AVCODEC_AVCODEC_INTERNAL_H	61	#endif // AVCODEC_AVCODEC_INTERNAL_H

 #include "libavutil/opt.h"
 #include "libavutil/thread.h"
 #include "avcodec.h"
+#include "avcodec_internal.h"
 #include "encode.h"
 #include "internal.h"
 #include "pthread_internal.h"
         pthread_mutex_unlock(&c->finished_task_mutex);
     }
 end:
-    avcodec_close(avctx);
+    ff_codec_close(avctx);
     av_freep(&avctx);
     return NULL;
 }
     return 0;
 fail:
-    avcodec_close(thread_avctx);
+    ff_codec_close(thread_avctx);
     av_freep(&thread_avctx);
     avctx->thread_count = i;
     av_log(avctx, AV_LOG_ERROR, "ff_frame_thread_encoder_init failed\n");

 #include "config_components.h"
 #include "avcodec.h"
+#include "avcodec_internal.h"
 #include "codec_internal.h"
 #include "libavutil/avassert.h"
 #include "libavutil/internal.h"
     if (!avctx)
         return;
-    avcodec_close(avctx);
+    ff_codec_close(avctx);
     av_freep(&avctx->extradata);
     av_freep(&avctx->subtitle_header);

@@ -52,6 +52,7 @@ · 51 unmodified lines
52		52
53	#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62)	53	#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62)
54	#define FF_API_FF_PROFILE_LEVEL (LIBAVCODEC_VERSION_MAJOR < 62)	54	#define FF_API_FF_PROFILE_LEVEL (LIBAVCODEC_VERSION_MAJOR < 62)
		55	#define FF_API_AVCODEC_CLOSE (LIBAVCODEC_VERSION_MAJOR < 62)
55		56
56	// reminder to remove CrystalHD decoders on next major bump	57	// reminder to remove CrystalHD decoders on next major bump
57	#define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61)	58	#define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61)

Keyboard shortcuts