Browse Source

lavc: Drop deprecated error rate option

Deprecated in 10/2013.
tags/n4.0
Vittorio Giovara 9 years ago
parent
commit
72dc7ddd18
4 changed files with 0 additions and 22 deletions
  1. +0
    -9
      libavcodec/avcodec.h
  2. +0
    -7
      libavcodec/mpegvideo_enc.c
  3. +0
    -3
      libavcodec/options_table.h
  4. +0
    -3
      libavcodec/version.h

+ 0
- 9
libavcodec/avcodec.h View File

@@ -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).


+ 0
- 7
libavcodec/mpegvideo_enc.c View File

@@ -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)


+ 0
- 3
libavcodec/options_table.h View File

@@ -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


+ 0
- 3
libavcodec/version.h View File

@@ -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…
Cancel
Save