Use FFMpeg instead of Avconv

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

diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.java b/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.java
index 7395c31..b106cba 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.java
+++ b/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.java
@@ -1,11 +1,11 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 2019, 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.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
 
 package eu.svjatoslav.meviz.encoder;
 
@@ -16,12 +16,12 @@ import java.util.List;
 
 public class FormatsRegistry {
 
-    public ArrayList<AbstractConverter> encoders = new ArrayList<AbstractConverter>();
+    private final ArrayList<AbstractConverter> encoders = new ArrayList<>();
 
     public FormatsRegistry() {
         // video conversion
         registerEncoder(new Ffmpeg2theora());
-        registerEncoder(new AvconvVideo());
+        registerEncoder(new FFMpegVideo());
 
         // image conversion
         registerEncoder(new Convert());
@@ -32,7 +32,7 @@ public class FormatsRegistry {
         // audio conversion
         registerEncoder(new Ogg2Wav());
         registerEncoder(new Flac());
-        registerEncoder(new AvconvAudio());
+        registerEncoder(new FFMpegAudio());
         registerEncoder(new Midi2Wav());
     }
 
@@ -42,7 +42,7 @@ public class FormatsRegistry {
         final String sourceFormatLowerCase = sourceFormat.toLowerCase();
         final String targetFormatLowerCase = targetFormat.toLowerCase();
 
-        final ArrayList<AbstractConverter> encoders = new ArrayList<AbstractConverter>();
+        final ArrayList<AbstractConverter> encoders = new ArrayList<>();
 
         for (final AbstractConverter encoder : this.encoders)
             if (encoder.supportsSource(sourceFormatLowerCase))
@@ -54,7 +54,7 @@ public class FormatsRegistry {
         return encoders;
     }
 
-    public void registerEncoder(final AbstractConverter encoder) {
+    private void registerEncoder(final AbstractConverter encoder) {
         encoders.add(encoder);
     }