Mercurial > mplayer.hg

changeset 25853:0dffd5c6422e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sub_scale command can now handle both ass and non-ass subs at a time
author ben
date Sun, 27 Jan 2008 15:31:24 +0000
parents 43c76ab0bb84
children beed202262fa
files command.c
diffstat 1 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/command.c	Sun Jan 27 15:15:55 2008 +0000
+++ b/command.c	Sun Jan 27 15:31:24 2008 +0000
@@ -1801,13 +1801,9 @@
                 ass_font_scale = *(float *) arg;
                 ass_force_reload = 1;
             }
-            else {
 #endif
                 text_font_scale_factor = *(float *) arg;
                 force_load_font = 1;
-#ifdef USE_ASS
-            }
-#endif
             return M_PROPERTY_OK;
         case M_PROPERTY_STEP_UP:
         case M_PROPERTY_STEP_DOWN:
@@ -1818,15 +1814,11 @@
                 M_PROPERTY_CLAMP(prop, ass_font_scale);
                 ass_force_reload = 1;
             }
-            else {
 #endif
                 text_font_scale_factor += (arg ? *(float *) arg : 0.1)*
                   (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0);
                 M_PROPERTY_CLAMP(prop, text_font_scale_factor);
                 force_load_font = 1;
-#ifdef USE_ASS
-            }
-#endif
             return M_PROPERTY_OK;
         default:
 #ifdef USE_ASS