Add function to export EDGE_WIDTH from libavcodec.

[ffmpeg] / libavcodec / roqvideo.c

diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c
index edccc5f066c261d8eafa3dd545c2554d0b359549..d97c4361ce47578574f9a9b3537e80496d8d7594 100644 (file)
--- a/libavcodec/roqvideo.c
+++ b/libavcodec/roqvideo.c
@@ -20,8 +20,8 @@
  */
 
 /**
- * @file roqvideo.c
- * Id RoQ Video common functions based on work by Dr. Tim Ferguson
+ * @file libavcodec/roqvideo.c
+ * id RoQ Video common functions based on work by Dr. Tim Ferguson
  */
 
 #include "avcodec.h"
@@ -44,7 +44,7 @@ void ff_apply_vector_2x2(RoqContext *ri, int x, int y, roq_cell *cell)
     int boffs,stride;
 
     stride = ri->current_frame->linesize[0];
-    boffs = (y * stride) + x;
+    boffs = y*stride + x;
 
     bptr = ri->current_frame->data[0] + boffs;
     bptr[0       ] = cell->y[0];
@@ -74,7 +74,7 @@ void ff_apply_vector_4x4(RoqContext *ri, int x, int y, roq_cell *cell)
     int boffs,stride;
 
     stride = ri->current_frame->linesize[0];
-    boffs = (y * stride) + x;
+    boffs = y*stride + x;
 
     bptr = ri->current_frame->data[0] + boffs;
     bptr[         0] = bptr[         1] = bptr[stride    ] = bptr[stride  +1] = cell->y[0];
@@ -118,8 +118,8 @@ static inline void apply_motion_generic(RoqContext *ri, int x, int y, int deltax
     for(cp = 0; cp < 3; cp++) {
         int outstride = ri->current_frame->linesize[cp];
         int instride  = ri->last_frame   ->linesize[cp];
-        block_copy(ri->current_frame->data[cp] + (y*outstride) + x,
-                   ri->last_frame->data[cp] + (my*instride) + mx,
+        block_copy(ri->current_frame->data[cp] + y*outstride + x,
+                   ri->last_frame->data[cp] + my*instride + mx,
                    outstride, instride, sz);
     }
 }