avcodec: Remove deprecated VBV delay field

Deprecated in 2507b5dd674834be7261772996f47ae3b95cca69.

Andreas Rheinhardt committed 5 years ago

Commit eb6ea941 parent 4a66fe13 files · +0 −22Browse files

Unified · Split

3 files

@@ -1854,19 +1854,6 @@ typedef struct AVCodecContext { · 1853 unmodified lines
1854	uint8_t *subtitle_header;	1854	uint8_t *subtitle_header;
1855	int subtitle_header_size;	1855	int subtitle_header_size;
1856		1856
1857	#if FF_API_VBV_DELAY
1858	/**
1859	* VBV delay coded in the last frame (in periods of a 27 MHz clock).
1860	* Used for compliant TS muxing.
1861	* - encoding: Set by libavcodec.
1862	* - decoding: unused.
1863	* @deprecated this value is now exported as a part of
1864	* AV_PKT_DATA_CPB_PROPERTIES packet side data
1865	*/
1866	attribute_deprecated
1867	uint64_t vbv_delay;
1868	#endif
1869
1870	/**	1857	/**
1871	* Audio only. The number of "priming" samples (padding) inserted by the	1858	* Audio only. The number of "priming" samples (padding) inserted by the
1872	* encoder at the beginning of the audio. I.e. this number of leading	1859	* encoder at the beginning of the audio. I.e. this number of leading

                 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;

 #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

Keyboard shortcuts