avcodec: Remove deprecated VBV delay field
Deprecated in 2507b5dd674834be7261772996f47ae3b95cca69. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
4a66fe1588
commit
eb6ea948ed
libavcodec
@ -1854,19 +1854,6 @@ typedef struct AVCodecContext {
|
||||
uint8_t *subtitle_header;
|
||||
int subtitle_header_size;
|
||||
|
||||
#if FF_API_VBV_DELAY
|
||||
/**
|
||||
* VBV delay coded in the last frame (in periods of a 27 MHz clock).
|
||||
* Used for compliant TS muxing.
|
||||
* - encoding: Set by libavcodec.
|
||||
* - decoding: unused.
|
||||
* @deprecated this value is now exported as a part of
|
||||
* AV_PKT_DATA_CPB_PROPERTIES packet side data
|
||||
*/
|
||||
attribute_deprecated
|
||||
uint64_t vbv_delay;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Audio only. The number of "priming" samples (padding) inserted by the
|
||||
* encoder at the beginning of the audio. I.e. this number of leading
|
||||
|
@ -1913,12 +1913,6 @@ vbv_retry:
|
||||
av_freep(&props);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#if FF_API_VBV_DELAY
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
avctx->vbv_delay = vbv_delay * 300;
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
}
|
||||
s->total_bits += s->frame_bits;
|
||||
|
||||
|
@ -54,9 +54,6 @@
|
||||
#ifndef FF_API_CODED_FRAME
|
||||
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||
#endif
|
||||
#ifndef FF_API_VBV_DELAY
|
||||
#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||
#endif
|
||||
#ifndef FF_API_NVENC_OLD_NAME
|
||||
#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user