[FFmpeg-cvslog] Revert "avcodec/options: add missing FF_API_COPY_CONTEXT checks"

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Feb 25 17:15:21 2021 -0300| [7addddd49e8043d96b47bd51cc42e8c3dbbd645f] | committer: James Almer

Revert "avcodec/options: add missing FF_API_COPY_CONTEXT checks"

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7addddd49e8043d96b47bd51cc42e8c3dbbd645f
---

 libavcodec/options.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 4bbf74ec7f..ff16e2cbfd 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -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