]> git.sesse.net Git - ffmpeg/commitdiff
Revert "avcodec/options: add missing FF_API_COPY_CONTEXT checks"
authorJames Almer <jamrial@gmail.com>
Thu, 25 Feb 2021 20:15:21 +0000 (17:15 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 25 Feb 2021 20:34:44 +0000 (17:34 -0300)
This reverts commit 0191f2d29c2a62b8699ac75f09708187e943814c.

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>
libavcodec/options.c

index 4bbf74ec7f78cc83f787577e424c27a85f5a2ef3..ff16e2cbfd63534e2444920299275bebf3bcedc6 100644 (file)
@@ -327,7 +327,6 @@ static const AVOption frame_options[]={
 {NULL},
 };
 
-#if FF_API_COPY_CONTEXT
 static const AVClass av_frame_class = {
     .class_name              = "AVFrame",
     .item_name               = NULL,
@@ -339,7 +338,6 @@ const AVClass *avcodec_get_frame_class(void)
 {
     return &av_frame_class;
 }
-#endif
 
 #define SROFFSET(x) offsetof(AVSubtitleRect,x)
 
@@ -354,7 +352,6 @@ static const AVOption subtitle_rect_options[]={
 {NULL},
 };
 
-#if FF_API_COPY_CONTEXT
 static const AVClass av_subtitle_rect_class = {
     .class_name             = "AVSubtitleRect",
     .item_name              = NULL,
@@ -366,4 +363,3 @@ const AVClass *avcodec_get_subtitle_rect_class(void)
 {
     return &av_subtitle_rect_class;
 }
-#endif