Browse Source

Revert "avcodec/options: add missing FF_API_COPY_CONTEXT checks"

This reverts commit 0191f2d29c.

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>
tags/n4.4
James Almer 4 years ago
parent
commit
7addddd49e
1 changed files with 0 additions and 4 deletions
  1. +0
    -4
      libavcodec/options.c

+ 0
- 4
libavcodec/options.c View File

@@ -327,7 +327,6 @@ static const AVOption frame_options[]={
{NULL}, {NULL},
}; };


#if FF_API_COPY_CONTEXT
static const AVClass av_frame_class = { static const AVClass av_frame_class = {
.class_name = "AVFrame", .class_name = "AVFrame",
.item_name = NULL, .item_name = NULL,
@@ -339,7 +338,6 @@ const AVClass *avcodec_get_frame_class(void)
{ {
return &av_frame_class; return &av_frame_class;
} }
#endif


#define SROFFSET(x) offsetof(AVSubtitleRect,x) #define SROFFSET(x) offsetof(AVSubtitleRect,x)


@@ -354,7 +352,6 @@ static const AVOption subtitle_rect_options[]={
{NULL}, {NULL},
}; };


#if FF_API_COPY_CONTEXT
static const AVClass av_subtitle_rect_class = { static const AVClass av_subtitle_rect_class = {
.class_name = "AVSubtitleRect", .class_name = "AVSubtitleRect",
.item_name = NULL, .item_name = NULL,
@@ -366,4 +363,3 @@ const AVClass *avcodec_get_subtitle_rect_class(void)
{ {
return &av_subtitle_rect_class; return &av_subtitle_rect_class;
} }
#endif

Loading…
Cancel
Save