Author: andre
Date: 2010-03-22 17:47:07 +0100 (Mon, 22 Mar 2010)
New Revision: 41563
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/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:
added mpeg transport stream format and codec
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-03-22 16:25:54 UTC (rev 41562)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
2010-03-22 16:47:07 UTC (rev 41563)
@@ -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),
+ MP2T(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-03-22 16:25:54 UTC (rev 41562)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
2010-03-22 16:47:07 UTC (rev 41563)
@@ -69,6 +69,7 @@
M4A(60),
M4V(61),
+ TS(62),
GGP(70),
H264(71),
FLASH(80),
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-03-22 16:25:54 UTC (rev 41562)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
2010-03-22 16:47:07 UTC (rev 41563)
@@ -31,3 +31,4 @@
WMV2=mwv2
WMV3=wmv3
XVID=xvid
+MP2T=mp2t
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-03-22 16:25:54 UTC (rev 41562)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
2010-03-22 16:47:07 UTC (rev 41563)
@@ -31,3 +31,4 @@
WMV2=mwv2
WMV3=wmv3
XVID=xvid
+MP2T=mp2t
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-03-22 16:25:54 UTC (rev 41562)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
2010-03-22 16:47:07 UTC (rev 41563)
@@ -35,6 +35,7 @@
VODCAST=Vodcast
M4A=m4a
M4V=m4v
+TS=MPEG-Transport Stream
GGP=3ggp
H264=H.264
FLASH=Flash
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-03-22 16:25:54 UTC (rev 41562)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
2010-03-22 16:47:07 UTC (rev 41563)
@@ -35,6 +35,7 @@
VODCAST=Vodcast
M4A=m4a
M4V=m4v
+TS=MPEG-Transport Stream
GGP=3ggp
H264=H.264
FLASH=Flash
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
