diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
| commit | cdbebae44440bea97f300f256d722c1495753bc2 (patch) | |
| tree | b9fc7a0e480d3c10bd950cd8495b48982f78de78 /libavcodec/dnxhdenc.c | |
| parent | 8426edef4cf521104bb9288ac46a48dc4bdaee53 (diff) | |
| parent | 85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa (diff) | |
Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'
* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
lavc: fix bitshifts amount bigger than the type
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
| -rw-r--r-- | libavcodec/dnxhdenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index f5a803bb71..d7105a1479 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -117,7 +117,7 @@ static int dnxhd_10bit_dct_quantize(MpegEncContext *ctx, int16_t *block, for (i = 1; i < 64; ++i) { int j = scantable[i]; - int sign = block[j] >> 31; + int sign = FF_SIGNBIT(block[j]); int level = (block[j] ^ sign) - sign; level = level * qmat[j] >> DNX10BIT_QMAT_SHIFT; block[j] = (level ^ sign) - sign; |