Changeset 2d7665e0ed3e7fa2df2a740a5afe775777ed43c6

Show
Ignore:
Timestamp:
09/05/06 16:39:12 (3 years ago)
Author:
Boris Dorès <babal@videolan.org>
git-committer:
Boris Dorès <babal@videolan.org> 1147185552 +0000
git-parent:

[15dce7e1ebc88e0bb86961c2dd56790caff2f950]

git-author:
Boris Dorès <babal@videolan.org> 1147185552 +0000
Message:

- monitor aspect ratio, source aspect ratio and crop ratio are not

octal numbers

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/video_output/vout_intf.c

    r0d9b57b r2d7665e  
    236236    val.psz_string = ""; text.psz_string = _("Default"); 
    237237    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); 
    238     val.psz_string = "001:1"; text.psz_string = "1:1"; 
     238    val.psz_string = "1:1"; text.psz_string = "1:1"; 
    239239    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); 
    240     val.psz_string = "004:3"; text.psz_string = "4:3"; 
     240    val.psz_string = "4:3"; text.psz_string = "4:3"; 
    241241    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); 
    242     val.psz_string = "016:9"; text.psz_string = "16:9"; 
     242    val.psz_string = "16:9"; text.psz_string = "16:9"; 
    243243    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); 
    244244    val.psz_string = "16:10"; text.psz_string = "16:10"; 
     
    265265        if( psz_parser ) 
    266266        { 
    267             i_aspect_num = strtol( val.psz_string, 0, 0 ); 
    268             i_aspect_den = strtol( ++psz_parser, 0, 0 ); 
     267            i_aspect_num = strtol( val.psz_string, 0, 10 ); 
     268            i_aspect_den = strtol( ++psz_parser, 0, 10 ); 
    269269        } 
    270270        else 
     
    299299    val.psz_string = ""; text.psz_string = _("Default"); 
    300300    var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); 
    301     val.psz_string = "001:1"; text.psz_string = "1:1"; 
     301    val.psz_string = "1:1"; text.psz_string = "1:1"; 
    302302    var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); 
    303     val.psz_string = "004:3"; text.psz_string = "4:3"; 
     303    val.psz_string = "4:3"; text.psz_string = "4:3"; 
    304304    var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); 
    305     val.psz_string = "016:9"; text.psz_string = "16:9"; 
     305    val.psz_string = "16:9"; text.psz_string = "16:9"; 
    306306    var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); 
    307307    val.psz_string = "16:10"; text.psz_string = "16:10"; 
     
    742742    if( !psz_parser ) goto crop_end; 
    743743 
    744     i_aspect_num = strtol( newval.psz_string, &psz_end, 0 ); 
     744    i_aspect_num = strtol( newval.psz_string, &psz_end, 10 ); 
    745745    if( psz_end == newval.psz_string || !i_aspect_num ) goto crop_end; 
    746746 
    747     i_aspect_den = strtol( ++psz_parser, &psz_end, 0 ); 
     747    i_aspect_den = strtol( ++psz_parser, &psz_end, 10 ); 
    748748    if( psz_end == psz_parser || !i_aspect_den ) goto crop_end; 
    749749 
     
    798798    if( !psz_parser ) goto aspect_end; 
    799799 
    800     i_aspect_num = strtol( newval.psz_string, &psz_end, 0 ); 
     800    i_aspect_num = strtol( newval.psz_string, &psz_end, 10 ); 
    801801    if( psz_end == newval.psz_string || !i_aspect_num ) goto aspect_end; 
    802802 
    803     i_aspect_den = strtol( ++psz_parser, &psz_end, 0 ); 
     803    i_aspect_den = strtol( ++psz_parser, &psz_end, 10 ); 
    804804    if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end; 
    805805