diff options
| author | James Almer <jamrial@gmail.com> | 2021-02-25 17:17:33 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-02-25 17:35:13 -0300 |
| commit | e96ea80e85b848eaa1992f27851120c7a985bd63 (patch) | |
| tree | aa81cfb0c5af751b382e152a321d181cc520228a /libavcodec | |
| parent | 7addddd49e8043d96b47bd51cc42e8c3dbbd645f (diff) | |
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@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |