avoid name clash - fixed again block size selection

[ffmpeg] / libavcodec / common.h

diff --git a/libavcodec/common.h b/libavcodec/common.h
index fd37e9abc8187e31770c6ea8b5fed29f772a26b9..ce26697816945bb01e4e98afcbe8e4efbe56ef1f 100644 (file)
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -157,6 +157,8 @@ inline void dprintf(const char* fmt,...) {}
 
 #    define av_abort()      do { fprintf(stderr, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
 
+//rounded divison & shift
+#define RSHIFT(a,b) ((a) > 0 ? ((a) + (1<<((b)-1)))>>(b) : ((a) + (1<<((b)-1))-1)>>(b))
 /* assume b>0 */
 #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
 #define ABS(a) ((a) >= 0 ? (a) : (-(a)))