mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
lavc: Drop deprecated error rate option
Deprecated in 10/2013.
This commit is contained in:
parent
dcc39ee10e
commit
72dc7ddd18
@ -2958,15 +2958,6 @@ typedef struct AVCodecContext {
|
||||
uint8_t *subtitle_header;
|
||||
int subtitle_header_size;
|
||||
|
||||
#if FF_API_ERROR_RATE
|
||||
/**
|
||||
* @deprecated use the 'error_rate' private AVOption of the mpegvideo
|
||||
* encoders
|
||||
*/
|
||||
attribute_deprecated
|
||||
int error_rate;
|
||||
#endif
|
||||
|
||||
#if FF_API_VBV_DELAY
|
||||
/**
|
||||
* VBV delay coded in the last frame (in periods of a 27 MHz clock).
|
||||
|
@ -874,13 +874,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
if (ff_rate_control_init(s) < 0)
|
||||
return -1;
|
||||
|
||||
#if FF_API_ERROR_RATE
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (avctx->error_rate)
|
||||
s->error_rate = avctx->error_rate;
|
||||
FF_ENABLE_DEPRECATION_WARNINGS;
|
||||
#endif
|
||||
|
||||
#if FF_API_NORMALIZE_AQP
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (avctx->flags & CODEC_FLAG_NORMALIZE_AQP)
|
||||
|
@ -313,9 +313,6 @@ static const AVOption avcodec_options[] = {
|
||||
#endif
|
||||
{"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
{"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"},
|
||||
#if FF_API_ERROR_RATE
|
||||
{"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
|
||||
#endif
|
||||
{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|E|D, "threads"},
|
||||
{"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
|
||||
#if FF_API_MPV_OPT
|
||||
|
@ -47,9 +47,6 @@
|
||||
* the public API and may change, break or disappear at any time.
|
||||
*/
|
||||
|
||||
#ifndef FF_API_ERROR_RATE
|
||||
#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_QSCALE_TYPE
|
||||
#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user