diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:40:22 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:40:22 +0300 |
commit | a8ab64d2f70029a87467f75d1412bf6d13664b64 (patch) | |
tree | 1792a7f59dabf8f277d4f6db49d6a52bf0464d88 /libavcodec/internal.h | |
parent | e15e78f391abf4e037352cd783f6fa3c6b843d94 (diff) | |
parent | 910247f1720c6aae422723c05dac6d0b19f20bec (diff) |
Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'
* commit '910247f1720c6aae422723c05dac6d0b19f20bec':
lavc: Deprecate avctx.{inter,intra}_quant_bias
Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
-rw-r--r-- | libavcodec/internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index a49bf34a26..cea5355380 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -61,6 +61,10 @@ #endif +#if !FF_API_QUANT_BIAS +#define FF_DEFAULT_QUANT_BIAS 999999 +#endif + #define FF_SANE_NB_CHANNELS 63U #define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1) |