[FFmpeg-cvslog] avcodec: unschedule removing some functions with FF_API_COPY_CONTEXT
James Almer
git at videolan.org
Thu Feb 25 22:36:58 EET 2021
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Feb 25 17:17:33 2021 -0300| [e96ea80e85b848eaa1992f27851120c7a985bd63] | committer: James Almer
avcodec: unschedule removing some functions with FF_API_COPY_CONTEXT
These functions were never deprecated. The merge from commit 6988cf2969
included them by mistake.
Found-by: mkver
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e96ea80e85b848eaa1992f27851120c7a985bd63
---
libavcodec/avcodec.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5df6a8aedc..ddca770cc4 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2770,7 +2770,6 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
*/
const AVClass *avcodec_get_class(void);
-#if FF_API_COPY_CONTEXT
/**
* Get the AVClass for AVFrame. It can be used in combination with
* AV_OPT_SEARCH_FAKE_OBJ for examining options.
@@ -2787,6 +2786,7 @@ const AVClass *avcodec_get_frame_class(void);
*/
const AVClass *avcodec_get_subtitle_rect_class(void);
+#if FF_API_COPY_CONTEXT
/**
* Copy the settings of the source AVCodecContext into the destination
* AVCodecContext. The resulting destination codec context will be
More information about the ffmpeg-cvslog
mailing list