aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-01 19:39:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 02:13:08 +0200
commit89e08520fc611b55f3ab6f513c29fa06103dffff (patch)
tree19a18dc0afbc406677684d43d9d30d2a08560d27
parent6e4e32e7590c0b4fabd4248a54c30a9898ed530a (diff)
downloadffmpeg-89e08520fc611b55f3ab6f513c29fa06103dffff.tar.gz
avcodec/h264_cabac: use int instead of long for mbb_xy
The mb address fits in int Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 592ba6ec106206f97133c9345313010c76361e12) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_cabac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 60048e0112..a35dca94dd 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1278,7 +1278,7 @@ void ff_h264_init_cabac_states(H264Context *h) {
}
static int decode_cabac_field_decoding_flag(H264Context *h) {
- const long mbb_xy = h->mb_xy - 2L*h->mb_stride;
+ const int mbb_xy = h->mb_xy - 2*h->mb_stride;
unsigned long ctx = 0;