added webm support

[meviz.git] / src / main / java / eu / svjatoslav / meviz / encoder / Encoder.java

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
index 420fa49..4b56b13 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -15,7 +15,7 @@ import java.util.List;
 import eu.svjatoslav.commons.file.FilePathParser;
 import eu.svjatoslav.commons.string.WildCardMatcher;
 import eu.svjatoslav.meviz.Module;
-import eu.svjatoslav.meviz.encoder.converters.Converter;
+import eu.svjatoslav.meviz.encoder.converters.AbstractConverter;
 
 public class Encoder implements Module {
 
@@ -69,7 +69,7 @@ public class Encoder implements Module {
 
                                        if (!targetFile.exists()) {
 
-                                               final List<eu.svjatoslav.meviz.encoder.converters.Converter> formats = encoderRegistry
+                                               final List<eu.svjatoslav.meviz.encoder.converters.AbstractConverter> formats = encoderRegistry
                                                                .getEncoders(sourceFileExtension, targetFormat);
 
                                                if (formats.size() == 0)
@@ -87,12 +87,13 @@ public class Encoder implements Module {
                                                                                        + targetFormat
                                                                                        + " format.");
                                                else {
-                                                       final Converter chosenFormat = formats.get(0);
+                                                       final AbstractConverter chosenFormat = formats
+                                                                       .get(0);
                                                        final EncodingTask encodingTask = new EncodingTask(
-                                                                       sourceFile, targetFile, chosenFormat);
+                                                                       sourceFile, targetFile, chosenFormat,
+                                                                       targetFormat);
 
-                                                       if (encodingOptions.terminal
-                                                                       || chosenFormat.isTerminalMandatory())
+                                                       if (chosenFormat.isTerminalMandatory())
                                                                encodingTask.setUseTerminal(true);
                                                        encodingPlan.scheduleTask(encodingTask);
                                                }