From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Date: Fri, 26 Feb 2021 07:22:35 +0000 (+0100)
Subject: avcodec: Remove deprecated VBV delay field
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=eb6ea948ed2f86361ae0b9d8689368d466b8337f;p=ffmpeg

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 909fb9172bc..89e32f1c809 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -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
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index c4fd6f293a4..34cad92895b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -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;
 
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 6405e23e2bc..4c3adbbb10c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -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