virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec: Remove deprecated VBV delay field

Browse Source 
Deprecated in 2507b5dd67.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-02-26 08:22:35 +01:00
committed by James Almer
parent 4a66fe1588
commit eb6ea948ed
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/avcodec.h
View File

@@ -1854,19 +1854,6 @@ typedef struct AVCodecContext {
uint8_t *subtitle_header; uint8_t *subtitle_header;
int subtitle_header_size; 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 * Audio only. The number of "priming" samples (padding) inserted by the
* encoder at the beginning of the audio. I.e. this number of leading * encoder at the beginning of the audio. I.e. this number of leading

6
libavcodec/mpegvideo_enc.c
View File

@@ -1913,12 +1913,6 @@ vbv_retry:
av_freep(&props); av_freep(&props);
return ret; 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; s->total_bits += s->frame_bits;

3
libavcodec/version.h
View File

@@ -54,9 +54,6 @@
#ifndef FF_API_CODED_FRAME #ifndef FF_API_CODED_FRAME
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_VBV_DELAY
#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_NVENC_OLD_NAME #ifndef FF_API_NVENC_OLD_NAME
#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif