Changeset 4ee9175bcfbfa255152c367ba6a8cdad74b9cbe1

Show
Ignore:
Timestamp:
13/07/05 19:51:13 (3 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1121277073 +0000
git-parent:

[21d7f14bbe121b27de988a11ca8d8664d1fb27c5]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1121277073 +0000
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_common.h

    re6a2e27 r4ee9175  
    10141014#endif 
    10151015 
    1016 VLC_EXPORT( vlc_bool_t, vlc_reduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) ); 
     1016VLC_EXPORT( vlc_bool_t, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) ); 
    10171017VLC_EXPORT( char **, vlc_parse_cmdline, ( const char *, int * ) ); 
    10181018 

  • include/vlc_symbols.h

    re6a2e27 r4ee9175  
    182182    void * (*vlc_readdir_inner) (void *); 
    183183    int (*vlc_closedir_inner) (void *); 
    184     vlc_bool_t (*vlc_reduce_inner) (unsigned *, unsigned *, uint64_t, uint64_t, uint64_t); 
     184    vlc_bool_t (*vlc_ureduce_inner) (unsigned *, unsigned *, uint64_t, uint64_t, uint64_t); 
    185185    char ** (*vlc_parse_cmdline_inner) (const char *, int *); 
    186186    char * (*vlc_wraptext_inner) (const char *, int, vlc_bool_t); 
    …… 
    549549#  define vlc_readdir (p_symbols)->vlc_readdir_inner 
    550550#  define vlc_closedir (p_symbols)->vlc_closedir_inner 
    551 #  define vlc_reduce (p_symbols)->vlc_reduce_inner 
     551#  define vlc_ureduce (p_symbols)->vlc_ureduce_inner 
    552552#  define vlc_parse_cmdline (p_symbols)->vlc_parse_cmdline_inner 
    553553#  define vlc_wraptext (p_symbols)->vlc_wraptext_inner 
    …… 
    919919    ((p_symbols)->vlc_readdir_inner) = vlc_readdir; \ 
    920920    ((p_symbols)->vlc_closedir_inner) = vlc_closedir; \ 
    921     ((p_symbols)->vlc_reduce_inner) = vlc_reduce; \ 
     921    ((p_symbols)->vlc_ureduce_inner) = vlc_ureduce; \ 
    922922    ((p_symbols)->vlc_parse_cmdline_inner) = vlc_parse_cmdline; \ 
    923923    ((p_symbols)->vlc_wraptext_inner) = vlc_wraptext; \ 

  • modules/codec/theora.c

    rfe087a3 r4ee9175  
    666666    if( p_enc->fmt_in.video.i_aspect ) 
    667667    { 
    668         int64_t i_num, i_den; 
    669         int i_dst_num, i_dst_den; 
     668        uint64_t i_num, i_den; 
     669        unsigned i_dst_num, i_dst_den; 
    670670 
    671671        i_num = p_enc->fmt_in.video.i_aspect * (int64_t)p_sys->ti.height; 
    672672        i_den = VOUT_ASPECT_FACTOR * p_sys->ti.width; 
    673         vlc_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); 
     673        vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); 
    674674        p_sys->ti.aspect_numerator = i_dst_num; 
    675675        p_sys->ti.aspect_denominator = i_dst_den; 

  • modules/codec/x264.c

    rfe087a3 r4ee9175  
    387387            (int64_t)p_enc->fmt_in.video.i_height; 
    388388        i_den = VOUT_ASPECT_FACTOR * p_enc->fmt_in.video.i_width; 
    389         vlc_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); 
     389        vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); 
    390390 
    391391        p_sys->param.vui.i_sar_width = i_dst_num; 

  • src/extras/libc.c

    r3df44d6 r4ee9175  
    464464 *   (adapted from libavcodec, author Michael Niedermayer <michaelni@gmx.at>) 
    465465 *****************************************************************************/ 
    466 vlc_bool_t vlc_reduce( unsigned *pi_dst_nom, unsigned *pi_dst_den, 
    467                        uint64_t i_nom, uint64_t i_den, uint64_t i_max ) 
     466vlc_bool_t vlc_ureduce( unsigned *pi_dst_nom, unsigned *pi_dst_den, 
     467                        uint64_t i_nom, uint64_t i_den, uint64_t i_max ) 
    468468{ 
    469469    vlc_bool_t b_exact = 1;