Merge branch 'master' into dev20110528_setting_reduce

Conflicts:
	.gitignore
	frontend/nbproject/project.properties

diff --cc frontend/nbproject/project.properties
index 694b51a,1ba01dc..fba00cc
--- 1/frontend/nbproject/project.properties
--- 2/frontend/nbproject/project.properties
+++ b/frontend/nbproject/project.properties
@@@ -27,11 -27,10 +27,12 @@@ endorsed.classpath
  excludes=\r
  file.reference.jmockit.jar=F:\\data\\java\\jmockit-0.998\\jmockit.jar\r
  includes=**\r
 +jar.archive.disabled=${jnlp.enabled}\r
  jar.compress=false\r
 +jar.index=${jnlp.enabled}\r
  javac.classpath=\\r
      ${reference.NicoBrowser.jar}:\\r
+     ${reference.MediaInfoWrapper.jar}:\\r
      ${libs.Commons-Configuration.classpath}:\\r
      ${libs.Commons-Lang.classpath}:\\r
      ${libs.Log4J.classpath}:\\r

diff --cc frontend/src/saccubus/MainFrame.java
Simple merge

diff --cc frontend/src/saccubus/converter/FfmpegCommand.java
index 3aa7d7d,da8641a..ede933c
--- 1/frontend/src/saccubus/converter/FfmpegCommand.java
--- 2/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@@ -12,11 -12,14 +12,14 @@@ import java.util.List
  import org.apache.commons.lang.StringUtils;
  import saccubus.ConvertStopFlag;
  import saccubus.conv.ConvertToVideoHook;
 -import saccubus.converter.profile.Ffmpeg;
 -import saccubus.converter.profile.FfmpegOption;
 -import saccubus.converter.profile.GeneralSetting;
 -import saccubus.converter.profile.NgSetting;
 +import yukihane.saccubus.converter.profile.NgSetting;
 +import yukihane.saccubus.converter.profile.Ffmpeg;
 +import yukihane.saccubus.converter.profile.FfmpegOption;
 +import yukihane.saccubus.converter.profile.GeneralSetting;
  import saccubus.net.TextProgressListener;
+ import yukihane.mediainfowrapper.Info;
+ import yukihane.mediainfowrapper.MediaInfo;
+ import yukihane.mediainfowrapper.Size;
  import yukihane.swf.Cws2Fws;
  
  /**

diff --cc frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
index d5d80d8,34ea3fc..ae7807e
--- 1/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
--- 2/frontend/src/saccubus/converter/profile/FfmpegOption.java
+++ b/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
@@@ -10,12 -11,17 +11,17 @@@ import org.apache.commons.lang.StringUt
   *
   * @author yuki
   */
 -public class FfmpegOption {
 +public class FfmpegOption implements yukihane.saccubus.converter.profile.FfmpegOption {
  
      private final String extOption;
+     private final String mainOption;
      private final String inOption;
      private final String outOption;
-     private final String mainOption;
+     private final String avfilterOption;
+     private final boolean resize;
+     private final int resizeWidth;
+     private final int resizeHeight;
+     private final boolean adjustRatio;
  
      public static FfmpegOption load(File file) throws IOException {
          Properties prop = new Properties();

diff --cc frontend/src/saccubus/prompt/Prompt.java
Simple merge

diff --cc frontend/src/saccubus/properties/MovieSetting.java
Simple merge

diff --cc frontend/src/saccubus/properties/SProperties.java
index 71a99d3,9c83820..450e6e3
--- 1/frontend/src/saccubus/properties/SProperties.java
--- 2/frontend/src/saccubus/properties/SProperties.java
+++ b/frontend/src/saccubus/properties/SProperties.java
@@@ -5,17 -5,19 +5,19 @@@ import java.util.Properties
  import java.io.IOException;
  import java.io.FileOutputStream;
  import java.io.FileInputStream;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
  import saccubus.VideoSaveKind;
 -import saccubus.converter.filegetter.LoginInfo;
 -import saccubus.converter.profile.CommentGetInfo;
 -import saccubus.converter.profile.Ffmpeg;
 -import saccubus.converter.profile.FfmpegOption;
 -import saccubus.converter.profile.GeneralSetting;
 -import saccubus.converter.profile.InputFileSetting;
 -import saccubus.converter.profile.OutputFileSetting;
 -import saccubus.converter.profile.Profile;
 -import saccubus.converter.profile.Proxy;
 -import saccubus.converter.profile.SFile;
 +import saccubus.converter.classic.profile.LoginInfo;
 +import saccubus.converter.classic.profile.CommentGetInfo;
 +import saccubus.converter.classic.profile.Ffmpeg;
 +import saccubus.converter.classic.profile.FfmpegOption;
 +import saccubus.converter.classic.profile.GeneralSetting;
 +import saccubus.converter.classic.profile.InputFileSetting;
 +import saccubus.converter.classic.profile.OutputFileSetting;
 +import saccubus.converter.classic.profile.Profile;
 +import saccubus.converter.classic.profile.Proxy;
 +import saccubus.converter.classic.profile.SFile;
  
  /**
   * <p>