diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-17 10:07:24 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-05-24 21:38:16 +0200 |
| commit | 8d788c567a1338e5b1e322f5ef8db55bc326d41a (patch) | |
| tree | 70414d1fc573d5de0c88e0b19908151dc488a83a | |
| parent | d587b1c32388fe60d7469424172e15b57bc5b4bd (diff) | |
| download | ffmpeg-8d788c567a1338e5b1e322f5ef8db55bc326d41a.tar.gz | |
avcodec/mjpegenc: Remove ineffective pred option
Never did anything, so it is removed immediately.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/mjpegenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 | ||||
| -rw-r--r-- | libavcodec/version_major.h | 1 |
4 files changed, 1 insertions, 12 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 0ba166da5d..27217441a3 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -627,12 +627,6 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { FF_MPV_COMMON_OPTS -#if FF_API_MJPEG_PRED -{ "pred", "Deprecated, does nothing", FF_MPV_OFFSET(dummy), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 3, VE, "pred" }, - { "left", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "pred" }, - { "plane", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "pred" }, - { "median", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 }, INT_MIN, INT_MAX, VE, "pred" }, -#endif { "huffman", "Huffman table strategy", OFFSET(huffman), AV_OPT_TYPE_INT, { .i64 = HUFFMAN_TABLE_OPTIMAL }, 0, NB_HUFFMAN_TABLE_OPTION - 1, VE, "huffman" }, { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_DEFAULT }, INT_MIN, INT_MAX, VE, "huffman" }, { "optimal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_OPTIMAL }, INT_MIN, INT_MAX, VE, "huffman" }, diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 4b07c5bfb2..82889a0edd 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -536,10 +536,6 @@ typedef struct MpegEncContext { int noise_reduction; int intra_penalty; - -#if FF_API_MJPEG_PRED - int dummy; ///< used as target for deprecated options -#endif } MpegEncContext; diff --git a/libavcodec/version.h b/libavcodec/version.h index 497389d3f3..56dbb9238d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 31 +#define LIBAVCODEC_VERSION_MINOR 32 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 87609d5436..1e23ed5e03 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -48,7 +48,6 @@ #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_MJPEG_PRED (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_SVTAV1_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) |