Skip to content

Commit e96ea80

Browse files
committed
avcodec: unschedule removing some functions with FF_API_COPY_CONTEXT
These functions were never deprecated. The merge from commit 6988cf2 included them by mistake. Found-by: mkver Signed-off-by: James Almer <[email protected]>
1 parent 7addddd commit e96ea80

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

libavcodec/avcodec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2770,7 +2770,6 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
27702770
*/
27712771
const AVClass *avcodec_get_class(void);
27722772

2773-
#if FF_API_COPY_CONTEXT
27742773
/**
27752774
* Get the AVClass for AVFrame. It can be used in combination with
27762775
* AV_OPT_SEARCH_FAKE_OBJ for examining options.
@@ -2787,6 +2786,7 @@ const AVClass *avcodec_get_frame_class(void);
27872786
*/
27882787
const AVClass *avcodec_get_subtitle_rect_class(void);
27892788

2789+
#if FF_API_COPY_CONTEXT
27902790
/**
27912791
* Copy the settings of the source AVCodecContext into the destination
27922792
* AVCodecContext. The resulting destination codec context will be

0 commit comments

Comments
 (0)