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
/
lagarith.c
diff --git
a/ffmpeg/libavcodec/lagarith.c
b/ffmpeg/libavcodec/lagarith.c
index a08d7fde1b59714c062683b75c7c5cd75f9501a2..2c6d70c0650b6f920b77bbcb0e0e8d98e18fc1b5 100644
(file)
--- a/
ffmpeg/libavcodec/lagarith.c
+++ b/
ffmpeg/libavcodec/lagarith.c
@@
-128,7
+128,7
@@
static int lag_decode_prob(GetBitContext *gb, uint32_t *value)
}
val = get_bits_long(gb, bits);
}
val = get_bits_long(gb, bits);
- val |= 1 << bits;
+ val |= 1
U
<< bits;
*value = val - 1;
*value = val - 1;
@@
-675,10
+675,10
@@
static int lag_decode_frame(AVCodecContext *avctx,
lag_decode_arith_plane(l, p->data[0], avctx->width, avctx->height,
p->linesize[0], buf + offset_ry,
buf_size - offset_ry);
lag_decode_arith_plane(l, p->data[0], avctx->width, avctx->height,
p->linesize[0], buf + offset_ry,
buf_size - offset_ry);
- lag_decode_arith_plane(l, p->data[1],
avctx->width
/ 2,
+ lag_decode_arith_plane(l, p->data[1],
(avctx->width + 1)
/ 2,
avctx->height, p->linesize[1],
buf + offset_gu, buf_size - offset_gu);
avctx->height, p->linesize[1],
buf + offset_gu, buf_size - offset_gu);
- lag_decode_arith_plane(l, p->data[2],
avctx->width
/ 2,
+ lag_decode_arith_plane(l, p->data[2],
(avctx->width + 1)
/ 2,
avctx->height, p->linesize[2],
buf + offset_bv, buf_size - offset_bv);
break;
avctx->height, p->linesize[2],
buf + offset_bv, buf_size - offset_bv);
break;
@@
-702,11
+702,11
@@
static int lag_decode_frame(AVCodecContext *avctx,
lag_decode_arith_plane(l, p->data[0], avctx->width, avctx->height,
p->linesize[0], buf + offset_ry,
buf_size - offset_ry);
lag_decode_arith_plane(l, p->data[0], avctx->width, avctx->height,
p->linesize[0], buf + offset_ry,
buf_size - offset_ry);
- lag_decode_arith_plane(l, p->data[2],
avctx->width
/ 2,
-
avctx->height
/ 2, p->linesize[2],
+ lag_decode_arith_plane(l, p->data[2],
(avctx->width + 1)
/ 2,
+
(avctx->height + 1)
/ 2, p->linesize[2],
buf + offset_gu, buf_size - offset_gu);
buf + offset_gu, buf_size - offset_gu);
- lag_decode_arith_plane(l, p->data[1],
avctx->width
/ 2,
-
avctx->height
/ 2, p->linesize[1],
+ lag_decode_arith_plane(l, p->data[1],
(avctx->width + 1)
/ 2,
+
(avctx->height + 1)
/ 2, p->linesize[1],
buf + offset_bv, buf_size - offset_bv);
break;
default:
buf + offset_bv, buf_size - offset_bv);
break;
default: