History

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
  1. libavcodec/avcodec.h +0 −13
  2. libavcodec/mpegvideo_enc.c +0 −6
  3. libavcodec/version.h +0 −3
libavcodec/avcodec.h+0−13
@@ -1854,19 +1854,6 @@ typedef struct AVCodecContext { · 1853 unmodified lines
18541854 uint8_t *subtitle_header;
18551855 int subtitle_header_size;
18561856
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−
18701857 /**
18711858 * Audio only. The number of "priming" samples (padding) inserted by the
18721859 * encoder at the beginning of the audio. I.e. this number of leading
libavcodec/mpegvideo_enc.c+0−6
@@ -1913,12 +1913,6 @@ vbv_retry: · 1912 unmodified lines
19131913 av_freep(&props);
19141914 return ret;
19151915 }
1916−
1917−#if FF_API_VBV_DELAY
1918−FF_DISABLE_DEPRECATION_WARNINGS
1919− avctx->vbv_delay = vbv_delay * 300;
1920−FF_ENABLE_DEPRECATION_WARNINGS
1921−#endif
19221916 }
19231917 s->total_bits += s->frame_bits;
19241918
libavcodec/version.h+0−3
@@ -54,9 +54,6 @@ · 53 unmodified lines
5454 #ifndef FF_API_CODED_FRAME
5555 #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
5656 #endif
57−#ifndef FF_API_VBV_DELAY
58−#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59)
59−#endif
6057 #ifndef FF_API_NVENC_OLD_NAME
6158 #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
6259 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t