Rename vlc_reduce to vlc_ureduce so that we won't get into troubles if

we ever need to reborn vlc_reduce for some unanticipated reason

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 8d2ac57f87d3246059562669d7977e313d46fa12..539cb1072d4fa6fe23ec575212ecbdaf17c5dde8 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -1013,7 +1013,7 @@ typedef __int64 off_t;
 #   include <tchar.h>
 #endif
 
-VLC_EXPORT( vlc_bool_t, vlc_reduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) );
+VLC_EXPORT( vlc_bool_t, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) );
 VLC_EXPORT( char **, vlc_parse_cmdline, ( const char *, int * ) );
 
 /* vlc_wraptext (defined in src/extras/libc.c) */

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index f144cc7ae248e81acaeffb734c2dd6a5556b1105..5ea737d851c57cd95c3257d87f1315ef473500d5 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -181,7 +181,7 @@ struct module_symbols_t
     void * (*vlc_opendir_inner) (const char *);
     void * (*vlc_readdir_inner) (void *);
     int (*vlc_closedir_inner) (void *);
-    vlc_bool_t (*vlc_reduce_inner) (unsigned *, unsigned *, uint64_t, uint64_t, uint64_t);
+    vlc_bool_t (*vlc_ureduce_inner) (unsigned *, unsigned *, uint64_t, uint64_t, uint64_t);
     char ** (*vlc_parse_cmdline_inner) (const char *, int *);
     char * (*vlc_wraptext_inner) (const char *, int, vlc_bool_t);
     vlc_iconv_t (*vlc_iconv_open_inner) (const char *, const char *);
@@ -548,7 +548,7 @@ struct module_symbols_t
 #  define vlc_opendir (p_symbols)->vlc_opendir_inner
 #  define vlc_readdir (p_symbols)->vlc_readdir_inner
 #  define vlc_closedir (p_symbols)->vlc_closedir_inner
-#  define vlc_reduce (p_symbols)->vlc_reduce_inner
+#  define vlc_ureduce (p_symbols)->vlc_ureduce_inner
 #  define vlc_parse_cmdline (p_symbols)->vlc_parse_cmdline_inner
 #  define vlc_wraptext (p_symbols)->vlc_wraptext_inner
 #  define vlc_iconv_open (p_symbols)->vlc_iconv_open_inner
@@ -918,7 +918,7 @@ struct module_symbols_t
     ((p_symbols)->vlc_opendir_inner) = vlc_opendir; \
     ((p_symbols)->vlc_readdir_inner) = vlc_readdir; \
     ((p_symbols)->vlc_closedir_inner) = vlc_closedir; \
-    ((p_symbols)->vlc_reduce_inner) = vlc_reduce; \
+    ((p_symbols)->vlc_ureduce_inner) = vlc_ureduce; \
     ((p_symbols)->vlc_parse_cmdline_inner) = vlc_parse_cmdline; \
     ((p_symbols)->vlc_wraptext_inner) = vlc_wraptext; \
     ((p_symbols)->vlc_iconv_open_inner) = vlc_iconv_open; \

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 76c017d2e6fa84393c4419eafd74e644fbc7ecd1..3b308c0b8086f86a1d1566095f2c28a6f96df0ca 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -665,12 +665,12 @@ static int OpenEncoder( vlc_object_t *p_this )
 
     if( p_enc->fmt_in.video.i_aspect )
     {
-        int64_t i_num, i_den;
-        int i_dst_num, i_dst_den;
+        uint64_t i_num, i_den;
+        unsigned i_dst_num, i_dst_den;
 
         i_num = p_enc->fmt_in.video.i_aspect * (int64_t)p_sys->ti.height;
         i_den = VOUT_ASPECT_FACTOR * p_sys->ti.width;
-        vlc_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
+        vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
         p_sys->ti.aspect_numerator = i_dst_num;
         p_sys->ti.aspect_denominator = i_dst_den;
     }

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 138ad690705d2122e80239250f56e2b05cc77467..4c52e43751d9c542b7b206c2345d77037f26b6a8 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -386,7 +386,7 @@ static int  Open ( vlc_object_t *p_this )
         i_num = p_enc->fmt_in.video.i_aspect *
             (int64_t)p_enc->fmt_in.video.i_height;
         i_den = VOUT_ASPECT_FACTOR * p_enc->fmt_in.video.i_width;
-        vlc_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
+        vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
 
         p_sys->param.vui.i_sar_width = i_dst_num;
         p_sys->param.vui.i_sar_height = i_dst_den;

diff --git a/src/extras/libc.c b/src/extras/libc.c
index 09a57d2e1501de836666899a75bc51900b88134d..1e30237b47fa554e479860f6e9e92b73ce258c2b 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -463,8 +463,8 @@ int vlc_iconv_close( vlc_iconv_t cd )
  * reduce a fraction
  *   (adapted from libavcodec, author Michael Niedermayer <michaelni@gmx.at>)
  *****************************************************************************/
-vlc_bool_t vlc_reduce( unsigned *pi_dst_nom, unsigned *pi_dst_den,
-                       uint64_t i_nom, uint64_t i_den, uint64_t i_max )
+vlc_bool_t vlc_ureduce( unsigned *pi_dst_nom, unsigned *pi_dst_den,
+                        uint64_t i_nom, uint64_t i_den, uint64_t i_max )
 {
     vlc_bool_t b_exact = 1;
     uint64_t i_gcd;