Author: andre
Date: 2010-06-15 11:34:46 +0200 (Tue, 15 Jun 2010)
New Revision: 42570
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/config/media/mimemapping.xml
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
Log:
porting from 2.0
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/config/media/mimemapping.xml
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/config/media/mimemapping.xml
2010-06-15 09:33:36 UTC (rev 42569)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/config/media/mimemapping.xml
2010-06-15 09:34:46 UTC (rev 42570)
@@ -18,6 +18,8 @@
<map format="oga" codec="*">audio/ogg</map>
<map format="ogv" codec="*">video/ogg</map>
+ <map format="webm" codec="*">video/webm</map>
+
<map format="aif" codec="*">audio/x-aif</map>
<map format="asf" codec="*">video/x-ms-asf</map>
<map format="avi" codec="*">video/avi</map>
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
2010-06-15 09:33:36 UTC (rev 42569)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
2010-06-15 09:34:46 UTC (rev 42570)
@@ -57,7 +57,8 @@
WMV1(110), // Windows Media Video 7
WMV2(111), // Windows Media Video 8
WMV3(112), // Windows Media Video 9
- XVID(113);
+ XVID(113),
+ VP8(114);
private static Logger log = Logging.getLoggerInstance(Codec.class);
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
2010-06-15 09:33:36 UTC (rev 42569)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
2010-06-15 09:34:46 UTC (rev 42570)
@@ -63,6 +63,8 @@
OGV (31),
OGA (32),
+
+ WEBM (40),
PODCAST(50),
VODCAST(51),
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
2010-06-15 09:33:36 UTC (rev 42569)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
2010-06-15 09:34:46 UTC (rev 42570)
@@ -31,3 +31,4 @@
WMV2=mwv2
WMV3=wmv3
XVID=xvid
+VP8=vp8
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
2010-06-15 09:33:36 UTC (rev 42569)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
2010-06-15 09:34:46 UTC (rev 42570)
@@ -31,3 +31,4 @@
WMV2=mwv2
WMV3=wmv3
XVID=xvid
+VP8=vp8
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
2010-06-15 09:33:36 UTC (rev 42569)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
2010-06-15 09:34:46 UTC (rev 42570)
@@ -31,6 +31,7 @@
MID=Midi
OGV=OGV (Theora)
OGA=OGA (Vorbis)
+WEBM=WebM (WebM/VP8)
PODCAST=Podcast
VODCAST=Vodcast
M4A=m4a
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
2010-06-15 09:33:36 UTC (rev 42569)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
2010-06-15 09:34:46 UTC (rev 42570)
@@ -31,6 +31,7 @@
MID=Midi
OGV=OGV (Theora)
OGA=OGA (Vorbis)
+WEBM=WebM (WebM/VP8)
PODCAST=Podcast
VODCAST=Vodcast
M4A=m4a
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
