Added new swscale options

2 files changed, 16 insertions, 10 deletions

diff --git a/config.c b/config.c
index 344a4c11..fdf635ce 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c,v 1.53 2008-02-20 03:25:11 phintuka Exp $
+ * $Id: config.c,v 1.54 2008-03-13 22:09:23 phintuka Exp $
  *
  */
 
@@ -491,10 +491,12 @@ config_t::config_t() {
   autocrop_fixedsize = 1;
   autocrop_subs  = 1;
 
-  swscale           = 0;    // enable/disable
-  swscale_downscale = 0;    // allow downscaling
-  swscale_width     = 720;  // output video width
-  swscale_height    = 576;  // output video height
+  swscale               = 0;    // enable/disable
+  swscale_change_aspect = 0;    // change video aspect ratio
+  swscale_resize        = 0;    // change video size
+  swscale_width         = 720;  //   output video width
+  swscale_height        = 576;  //   output video height
+  swscale_downscale     = 0;    //   allow downscaling
 
   remote_mode    = 0;
   listen_port    = LISTEN_PORT;
@@ -756,6 +758,8 @@ bool config_t::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "Video.AutoCrop.DetectSubs"))   autocrop_subs = atoi(Value);
 
   else if (!strcasecmp(Name, "Video.SwScale"))           swscale = atoi(Value);
+  else if (!strcasecmp(Name, "Video.SwScale.Aspect"))    swscale_change_aspect = atoi(Value);
+  else if (!strcasecmp(Name, "Video.SwScale.Resize"))    swscale_resize = atoi(Value);
   else if (!strcasecmp(Name, "Video.SwScale.Downscale")) swscale_downscale = atoi(Value);
   else if (!strcasecmp(Name, "Video.SwScale.Width"))     swscale_width = atoi(Value);
   else if (!strcasecmp(Name, "Video.SwScale.Height"))    swscale_height = atoi(Value);
diff --git a/config.h b/config.h
index 7664be78..35d6fd1a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.37 2008-02-20 03:25:11 phintuka Exp $
+ * $Id: config.h,v 1.38 2008-03-13 22:09:23 phintuka Exp $
  *
  */
 
@@ -278,10 +278,12 @@ class config_t {
     int  autocrop_subs;
 
     // (video) software scaling
-    int  swscale;             // enable/disable
-    int  swscale_downscale;   // allow downscaling
-    int  swscale_width;       // output video width
-    int  swscale_height;      // output video height
+    int  swscale;               // enable/disable
+    int  swscale_change_aspect; // change video aspect ratio
+    int  swscale_resize;        // change video size
+    int  swscale_width;         //   output video width
+    int  swscale_height;        //   output video height
+    int  swscale_downscale;     //   allow downscaling
 
     // sharpen / soften post plugin
     int  unsharp;                      // enable / disable