Skip to content

Commit 1eb3110

Browse files
mkverjamrial
authored andcommitted
avutil/frame: Remove deprecated getters and setters
Deprecated in 7df37dd. Signed-off-by: Andreas Rheinhardt <[email protected]> Signed-off-by: James Almer <[email protected]>
1 parent a240097 commit 1eb3110

File tree

3 files changed

+0
-67
lines changed

3 files changed

+0
-67
lines changed

libavutil/frame.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,6 @@
2727
#include "samplefmt.h"
2828
#include "hwcontext.h"
2929

30-
#if FF_API_FRAME_GET_SET
31-
MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp)
32-
MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration)
33-
MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos)
34-
MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout)
35-
MAKE_ACCESSORS(AVFrame, frame, int, channels)
36-
MAKE_ACCESSORS(AVFrame, frame, int, sample_rate)
37-
MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata)
38-
MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags)
39-
MAKE_ACCESSORS(AVFrame, frame, int, pkt_size)
40-
MAKE_ACCESSORS(AVFrame, frame, enum AVColorSpace, colorspace)
41-
MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range)
42-
#endif
43-
4430
#define CHECK_CHANNELS_CONSISTENCY(frame) \
4531
av_assert2(!(frame)->channel_layout || \
4632
(frame)->channels == \

libavutil/frame.h

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -651,56 +651,6 @@ typedef struct AVFrame {
651651
AVBufferRef *private_ref;
652652
} AVFrame;
653653

654-
#if FF_API_FRAME_GET_SET
655-
/**
656-
* Accessors for some AVFrame fields. These used to be provided for ABI
657-
* compatibility, and do not need to be used anymore.
658-
*/
659-
attribute_deprecated
660-
int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
661-
attribute_deprecated
662-
void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
663-
attribute_deprecated
664-
int64_t av_frame_get_pkt_duration (const AVFrame *frame);
665-
attribute_deprecated
666-
void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
667-
attribute_deprecated
668-
int64_t av_frame_get_pkt_pos (const AVFrame *frame);
669-
attribute_deprecated
670-
void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
671-
attribute_deprecated
672-
int64_t av_frame_get_channel_layout (const AVFrame *frame);
673-
attribute_deprecated
674-
void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
675-
attribute_deprecated
676-
int av_frame_get_channels (const AVFrame *frame);
677-
attribute_deprecated
678-
void av_frame_set_channels (AVFrame *frame, int val);
679-
attribute_deprecated
680-
int av_frame_get_sample_rate (const AVFrame *frame);
681-
attribute_deprecated
682-
void av_frame_set_sample_rate (AVFrame *frame, int val);
683-
attribute_deprecated
684-
AVDictionary *av_frame_get_metadata (const AVFrame *frame);
685-
attribute_deprecated
686-
void av_frame_set_metadata (AVFrame *frame, AVDictionary *val);
687-
attribute_deprecated
688-
int av_frame_get_decode_error_flags (const AVFrame *frame);
689-
attribute_deprecated
690-
void av_frame_set_decode_error_flags (AVFrame *frame, int val);
691-
attribute_deprecated
692-
int av_frame_get_pkt_size(const AVFrame *frame);
693-
attribute_deprecated
694-
void av_frame_set_pkt_size(AVFrame *frame, int val);
695-
attribute_deprecated
696-
enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
697-
attribute_deprecated
698-
void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
699-
attribute_deprecated
700-
enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
701-
attribute_deprecated
702-
void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
703-
#endif
704654

705655
#if FF_API_COLORSPACE_NAME
706656
/**

libavutil/version.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@
105105
* @{
106106
*/
107107

108-
#ifndef FF_API_FRAME_GET_SET
109-
#define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57)
110-
#endif
111108
#ifndef FF_API_PSEUDOPAL
112109
#define FF_API_PSEUDOPAL (LIBAVUTIL_VERSION_MAJOR < 57)
113110
#endif

0 commit comments

Comments
 (0)