diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:36:09 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:36:09 +0100 |
| commit | 31ae2308b3f6c1021d79da69c504490239895d60 (patch) | |
| tree | 4760053d9a303c341ab1eca82582b982ea3d5bfd /libavcodec/avcodec.h | |
| parent | b799619f48ba5fd07e91243f27f74638bcb875fb (diff) | |
| parent | 2507b5dd674834be7261772996f47ae3b95cca69 (diff) | |
Merge commit '2507b5dd674834be7261772996f47ae3b95cca69'
* commit '2507b5dd674834be7261772996f47ae3b95cca69':
mpegvideo_enc: export vbv_delay in side data
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e7f016cdcc..020465b167 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3162,13 +3162,18 @@ typedef struct AVCodecContext { int error_rate; #endif +#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 #if FF_API_SIDEDATA_ONLY_PKT /** |