projects
/
meviz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated GNU license
[meviz.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
meviz
/
encoder
/
converters
/
AvconvVideo.java
diff --git
a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
index
2492b52
..
e8ed780
100644
(file)
--- a/
src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
+++ b/
src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java
@@
-1,11
+1,11
@@
/*
* Meviz - Various tools collection to work with multimedia.
/*
* Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012 -- 201
7
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 201
9
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
*
* This program is free software; you can redistribute it and/or
*
* 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.converters;
package eu.svjatoslav.meviz.encoder.converters;
@@
-123,7
+123,7
@@
public class AvconvVideo extends AbstractConverter {
private List<String> getSupportedExtensions() {
return toList("mkv", "mts", "mp4", "avi", "mpg", "mpeg", "vob", "m4v",
private List<String> getSupportedExtensions() {
return toList("mkv", "mts", "mp4", "avi", "mpg", "mpeg", "vob", "m4v",
- "webm", "mov", "asf");
+ "webm", "mov", "asf"
, "3gp"
);
}
@Override
}
@Override