aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-01 19:39:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-13 20:48:08 +0100
commit8a16b27de9c3642715fd0834924dec3870b83a14 (patch)
tree550d866ac2ff50eae308c255b97854717c642b21
parentb8546aee84319617587e5b093e06cc50cc5a016d (diff)
downloadffmpeg-8a16b27de9c3642715fd0834924dec3870b83a14.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 c2e183d76b..d4ed266972 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1281,7 +1281,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;