Changeset 2d7665e0ed3e7fa2df2a740a5afe775777ed43c6
- 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
| r0d9b57b |
r2d7665e |
|
| 236 | 236 | val.psz_string = ""; text.psz_string = _("Default"); |
|---|
| 237 | 237 | 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"; |
|---|
| 239 | 239 | 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"; |
|---|
| 241 | 241 | 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"; |
|---|
| 243 | 243 | var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); |
|---|
| 244 | 244 | val.psz_string = "16:10"; text.psz_string = "16:10"; |
|---|
| … | … | |
| 265 | 265 | if( psz_parser ) |
|---|
| 266 | 266 | { |
|---|
| 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 ); |
|---|
| 269 | 269 | } |
|---|
| 270 | 270 | else |
|---|
| … | … | |
| 299 | 299 | val.psz_string = ""; text.psz_string = _("Default"); |
|---|
| 300 | 300 | 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"; |
|---|
| 302 | 302 | 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"; |
|---|
| 304 | 304 | 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"; |
|---|
| 306 | 306 | var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); |
|---|
| 307 | 307 | val.psz_string = "16:10"; text.psz_string = "16:10"; |
|---|
| … | … | |
| 742 | 742 | if( !psz_parser ) goto crop_end; |
|---|
| 743 | 743 | |
|---|
| 744 | | i_aspect_num = strtol( newval.psz_string, &psz_end, 0 ); |
|---|
| | 744 | i_aspect_num = strtol( newval.psz_string, &psz_end, 10 ); |
|---|
| 745 | 745 | if( psz_end == newval.psz_string || !i_aspect_num ) goto crop_end; |
|---|
| 746 | 746 | |
|---|
| 747 | | i_aspect_den = strtol( ++psz_parser, &psz_end, 0 ); |
|---|
| | 747 | i_aspect_den = strtol( ++psz_parser, &psz_end, 10 ); |
|---|
| 748 | 748 | if( psz_end == psz_parser || !i_aspect_den ) goto crop_end; |
|---|
| 749 | 749 | |
|---|
| … | … | |
| 798 | 798 | if( !psz_parser ) goto aspect_end; |
|---|
| 799 | 799 | |
|---|
| 800 | | i_aspect_num = strtol( newval.psz_string, &psz_end, 0 ); |
|---|
| | 800 | i_aspect_num = strtol( newval.psz_string, &psz_end, 10 ); |
|---|
| 801 | 801 | if( psz_end == newval.psz_string || !i_aspect_num ) goto aspect_end; |
|---|
| 802 | 802 | |
|---|
| 803 | | i_aspect_den = strtol( ++psz_parser, &psz_end, 0 ); |
|---|
| | 803 | i_aspect_den = strtol( ++psz_parser, &psz_end, 10 ); |
|---|
| 804 | 804 | if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end; |
|---|
| 805 | 805 | |
|---|