[FFmpeg-soc] [soc]: r811 - in jpeg2000: j2k.c j2k.h

[k.nowosad]

Author: k.nowosad
Date: Wed Aug 15 13:58:55 2007
New Revision: 811

Log:
moved two functions from j2k.c to j2k.h


Modified:
   jpeg2000/j2k.c
   jpeg2000/j2k.h

Modified: jpeg2000/j2k.c
==============================================================================
--- jpeg2000/j2k.c	(original)
+++ jpeg2000/j2k.c	Wed Aug 15 13:58:55 2007
@@ -46,16 +46,6 @@ void ff_j2k_printu(uint8_t *tab, int l)
 }
 #endif
 
-int ff_j2k_ceildivpow2(int a, int b)
-{
-    return (a + (1 << b) - 1)>> b;
-}
-
-int ff_j2k_ceildiv(int a, int b)
-{
-    return (a + b - 1) / b;
-}
-
 /* tag tree routines */
 
 /** allocate the memory for tag tree */

Modified: jpeg2000/j2k.h
==============================================================================
--- jpeg2000/j2k.h	(original)
+++ jpeg2000/j2k.h	Wed Aug 15 13:58:55 2007
@@ -104,8 +104,15 @@ void ff_j2k_printu(uint8_t *tab, int l);
 #endif
 
 /** misc tools */
-int ff_j2k_ceildivpow2(int a, int b);
-int ff_j2k_ceildiv(int a, int b);
+static inline int ff_j2k_ceildivpow2(int a, int b)
+{
+    return (a + (1 << b) - 1)>> b;
+}
+
+static inline int ff_j2k_ceildiv(int a, int b)
+{
+    return (a + b - 1) / b;
+}
 
 /** tag tree routines */
 J2kTgtNode *ff_j2k_tag_tree_init(int w, int h);