diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:40:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:40:22 +0200 |
| commit | a8ab64d2f70029a87467f75d1412bf6d13664b64 (patch) | |
| tree | 1792a7f59dabf8f277d4f6db49d6a52bf0464d88 /libavcodec/dnxhdenc.h | |
| parent | e15e78f391abf4e037352cd783f6fa3c6b843d94 (diff) | |
| parent | 910247f1720c6aae422723c05dac6d0b19f20bec (diff) | |
| download | ffmpeg-streaming-a8ab64d2f70029a87467f75d1412bf6d13664b64.zip ffmpeg-streaming-a8ab64d2f70029a87467f75d1412bf6d13664b64.tar.gz | |
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/dnxhdenc.h')
| -rw-r--r-- | libavcodec/dnxhdenc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 7ef0b96..3f531ef 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -63,6 +63,7 @@ typedef struct DNXHDEncContext { int nitris_compat; unsigned min_padding; + int intra_quant_bias; DECLARE_ALIGNED(16, int16_t, blocks)[8][64]; |
