History

avcodec: remove deprecated FF_API_SLICE_OFFSET

James Almer committed 2 years ago

Commit 98e1eeb1 parent 2717dcf3 files · +0 −22Browse files

Showing the changes to libavcodec (3 of 3 files). Show all

Unified · Split

3 files
  1. libavcodec/avcodec.h +0 −18
  2. libavcodec/options_table.h +0 −3
  3. libavcodec/version_major.h +0 −1
libavcodec/avcodec.h+0−18
@@ -798,24 +798,6 @@ typedef struct AVCodecContext { · 797 unmodified lines
798798 */
799799 float dark_masking;
800800
801−#if FF_API_SLICE_OFFSET
802− /**
803− * slice count
804− * - encoding: Set by libavcodec.
805− * - decoding: Set by user (or 0).
806− */
807− attribute_deprecated
808− int slice_count;
809−
810− /**
811− * slice offsets in the frame in bytes
812− * - encoding: Set/allocated by libavcodec.
813− * - decoding: Set/allocated by user (or NULL).
814− */
815− attribute_deprecated
816− int *slice_offset;
817−#endif
818−
819801 /**
820802 * sample aspect ratio (0 if unknown)
821803 * That is the width of a pixel divided by the height of the pixel.
libavcodec/options_table.h+0−3
@@ -179,9 +179,6 @@ static const AVOption avcodec_options[] = { · 178 unmodified lines
179179 {"xvidmmx", "deprecated, for compatibility only", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, .unit = "idct"},
180180 {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, .unit = "idct"},
181181 {"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, .unit = "idct"},
182−#if FF_API_SLICE_OFFSET
183−{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
184−#endif
185182 {"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, .unit = "ec"},
186183 {"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"},
187184 {"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"},
libavcodec/version_major.h+0−1
@@ -38,7 +38,6 @@ · 37 unmodified lines
3838 */
3939
4040 #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 61)
41−#define FF_API_SLICE_OFFSET (LIBAVCODEC_VERSION_MAJOR < 61)
4241 #define FF_API_SUBFRAMES (LIBAVCODEC_VERSION_MAJOR < 61)
4342 #define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 61)
4443 #define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 61)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t