X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fencoder%2Fconverters%2FConvert.java;h=e7abf5777f3c02dfb4028faedb27fc4bb0e0747e;hb=4b74c2be1dd6104f3a4dd50d29ece78857ada3fa;hp=03639b49fd6c7adb82645b1758cdbaebc3308594;hpb=565d9c726de9b50709027f9455d39499a17f4b25;p=meviz.git diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java index 03639b4..e7abf57 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.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. @@ -18,19 +18,19 @@ public class Convert extends AbstractConverter { @Override public String getCommand(final File inputFile, final File targetFile, - final EncodingOptions options) { + final EncodingOptions options, String targetFormat) { return "convert \"" + inputFile.getAbsolutePath() + "\" \"" + targetFile.getAbsolutePath() + "\""; } @Override public List getSourceFileExtensions() { - return toList("tif", "tiff", "jpg", "jpeg"); + return toList("tif", "tiff", "png", "jpg", "jpeg"); } @Override public List getTargetFileExtensions() { - return toList("png", "tiff"); + return toList("png", "tiff", "tif"); } @Override