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-12 17:10:36 +0100
commit979a54ed1833f667dc9c46e7290cd3cb50fa9aab (patch)
treee8912e3fe605a82240f4d626242e59bb204430b8
parentd11bca8043ddaf001aae83840df414732e3a5831 (diff)
downloadffmpeg-979a54ed1833f667dc9c46e7290cd3cb50fa9aab.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 6455ee7b2d..a411efed8c 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1282,7 +1282,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;