diff options
| author | James Almer <jamrial@gmail.com> | 2024-01-25 11:26:48 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:30 -0300 |
| commit | 98e1eebef98ed316b7fb58f288ddcbd49216ce79 (patch) | |
| tree | 497de81fdde343d28232a37263d3e274f4787d1d | |
| parent | 2717dcfb8527dd65a9fb0e7f8cb00d118af65b68 (diff) | |
| download | ffmpeg-98e1eebef98ed316b7fb58f288ddcbd49216ce79.tar.gz | |
avcodec: remove deprecated FF_API_SLICE_OFFSET
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/avcodec.h | 18 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version_major.h | 1 |
3 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b92b09553f..a035d48283 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -798,24 +798,6 @@ typedef struct AVCodecContext { */ float dark_masking; -#if FF_API_SLICE_OFFSET - /** - * slice count - * - encoding: Set by libavcodec. - * - decoding: Set by user (or 0). - */ - attribute_deprecated - int slice_count; - - /** - * slice offsets in the frame in bytes - * - encoding: Set/allocated by libavcodec. - * - decoding: Set/allocated by user (or NULL). - */ - attribute_deprecated - int *slice_offset; -#endif - /** * sample aspect ratio (0 if unknown) * That is the width of a pixel divided by the height of the pixel. diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index ac32d8928a..aa9f766984 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -179,9 +179,6 @@ static const AVOption avcodec_options[] = { {"xvidmmx", "deprecated, for compatibility only", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, .unit = "idct"}, {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, .unit = "idct"}, {"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, .unit = "idct"}, -#if FF_API_SLICE_OFFSET -{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif {"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, .unit = "ec"}, {"guess_mvs", "iterative motion vector (MV) search (slow)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_GUESS_MVS }, INT_MIN, INT_MAX, V|D, .unit = "ec"}, {"deblock", "use strong deblock filter for damaged MBs", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_DEBLOCK }, INT_MIN, INT_MAX, V|D, .unit = "ec"}, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index aa25304af0..bd81b80bc9 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -38,7 +38,6 @@ */ #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 61) -#define FF_API_SLICE_OFFSET (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_SUBFRAMES (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 61) |