From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Date: Thu, 25 Feb 2021 19:37:24 +0000 (+0100)
Subject: avcodec: Remove deprecated avcodec_get_context_defaults3
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ff8f9fcbe558db69f804417d4e9aa2ef9445f304;p=ffmpeg

avcodec: Remove deprecated avcodec_get_context_defaults3

Deprecated in 04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index a3c8c425cb3..cbc1556e0e3 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2545,15 +2545,6 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
  */
 void avcodec_free_context(AVCodecContext **avctx);
 
-#if FF_API_GET_CONTEXT_DEFAULTS
-/**
- * @deprecated This function should not be used, as closing and opening a codec
- * context multiple time is not supported. A new codec context should be
- * allocated for each new use.
- */
-int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
-#endif
-
 /**
  * Get the AVClass for AVCodecContext. It can be used in combination with
  * AV_OPT_SEARCH_FAKE_OBJ for examining options.
diff --git a/libavcodec/options.c b/libavcodec/options.c
index b8d4a9faf61..833072b1922 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -160,13 +160,6 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec)
     return 0;
 }
 
-#if FF_API_GET_CONTEXT_DEFAULTS
-int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
-{
-    return init_context_defaults(s, codec);
-}
-#endif
-
 AVCodecContext *avcodec_alloc_context3(const AVCodec *codec)
 {
     AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
diff --git a/libavcodec/version.h b/libavcodec/version.h
index fe102fe939b..14d9388aa41 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -66,9 +66,6 @@
 #ifndef FF_API_COPY_CONTEXT
 #define FF_API_COPY_CONTEXT     (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_GET_CONTEXT_DEFAULTS
-#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
 #ifndef FF_API_NVENC_OLD_NAME
 #define FF_API_NVENC_OLD_NAME    (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif