X-Git-Url: https://git.piment-noir.org/?p=deb_ffmpeg.git;a=blobdiff_plain;f=ffmpeg%2Flibavcodec%2Fdnxhdenc.c;fp=ffmpeg%2Flibavcodec%2Fdnxhdenc.c;h=d7105a1479dc27729b77c106b77c73c9d33820d3;hp=d438fbb64ed6d68e53f3d3e1c783f12fc45eb8f3;hb=f6fa7814ccfe3e76514b36cf04f5cd3cb657c8cf;hpb=2ba45a602cbfa7b771effba9b11bb4245c21bc00 diff --git a/ffmpeg/libavcodec/dnxhdenc.c b/ffmpeg/libavcodec/dnxhdenc.c index d438fbb..d7105a1 100644 --- a/ffmpeg/libavcodec/dnxhdenc.c +++ b/ffmpeg/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; @@ -314,6 +314,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) index = ff_dnxhd_get_cid_table(ctx->cid); av_assert0(index >= 0); + ctx->cid_table = &ff_dnxhd_cid_table[index]; ctx->m.avctx = avctx;