[FFmpeg-cvslog] avcodec/h264_cabac: use int instead of long for mbb_xy

Michael Niedermayer git at videolan.org
Wed Feb 4 17:17:54 CET 2015


ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  1 19:39:22 2015 +0100| [5f2902bdc76c4f166af365b9941bc6ed9b79198d] | committer: Michael Niedermayer

avcodec/h264_cabac: use int instead of long for mbb_xy

The mb address fits in int

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 592ba6ec106206f97133c9345313010c76361e12)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f2902bdc76c4f166af365b9941bc6ed9b79198d
---

 libavcodec/h264_cabac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 435343c..1f41751 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;
 



More information about the ffmpeg-cvslog mailing list