repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
dnxhdenc.c
diff --git
a/ffmpeg/libavcodec/dnxhdenc.c
b/ffmpeg/libavcodec/dnxhdenc.c
index d438fbb64ed6d68e53f3d3e1c783f12fc45eb8f3..d7105a1479dc27729b77c106b77c73c9d33820d3 100644
(file)
--- 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];
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;
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);
index = ff_dnxhd_get_cid_table(ctx->cid);
av_assert0(index >= 0);
+
ctx->cid_table = &ff_dnxhd_cid_table[index];
ctx->m.avctx = avctx;
ctx->cid_table = &ff_dnxhd_cid_table[index];
ctx->m.avctx = avctx;