[FFmpeg-cvslog] avcodec/h264pred_template: fix declarations after statements

Michael Niedermayer git at videolan.org
Tue Mar 18 20:55:43 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 18 20:47:04 2014 +0100| [05d7059ac6b640796001bf347d309a40a4fd4a12] | committer: Michael Niedermayer

avcodec/h264pred_template: fix declarations after statements

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

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

 libavcodec/h264pred_template.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c
index 3d67dd4..f684433 100644
--- a/libavcodec/h264pred_template.c
+++ b/libavcodec/h264pred_template.c
@@ -1126,15 +1126,13 @@ static void FUNCC(pred8x8l_horizontal_up)(uint8_t *_src, int has_topleft,
 }
 
 static void FUNCC(pred8x8l_vertical_filter_add)(uint8_t *_src, int16_t *_block, int has_topleft,
-                                     int has_topright, ptrdiff_t stride)
+                                     int has_topright, ptrdiff_t _stride)
 {
     int i;
     pixel *src = (pixel*)_src;
     const dctcoef *block = (const dctcoef*)_block;
     pixel pix[8];
-
-    stride >>= sizeof(pixel)-1;
-
+    int stride = _stride>>(sizeof(pixel)-1);
     PREDICT_8x8_LOAD_TOP;
 
     pix[0] = t0;
@@ -1164,15 +1162,13 @@ static void FUNCC(pred8x8l_vertical_filter_add)(uint8_t *_src, int16_t *_block,
 }
 
 static void FUNCC(pred8x8l_horizontal_filter_add)(uint8_t *_src, int16_t *_block, int has_topleft,
-                               int has_topright, ptrdiff_t stride)
+                               int has_topright, ptrdiff_t _stride)
 {
     int i;
     pixel *src = (pixel*)_src;
     const dctcoef *block = (const dctcoef*)_block;
     pixel pix[8];
-
-    stride >>= sizeof(pixel)-1;
-
+    int stride = _stride>>(sizeof(pixel)-1);
     PREDICT_8x8_LOAD_LEFT;
 
     pix[0] = l0;



More information about the ffmpeg-cvslog mailing list