Author: andre
Date: 2009-09-14 15:03:04 +0200 (Mon, 14 Sep 2009)
New Revision: 38599
Modified:
openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml
openimages/trunk/src/main/webapp/style/css/player.css
openimages/trunk/src/main/webapp/test-regex.jsp
Log:
bit more margin
Modified: openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
===================================================================
--- openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
2009-09-14 12:12:58 UTC (rev 38598)
+++ openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
2009-09-14 13:03:04 UTC (rev 38599)
@@ -57,10 +57,12 @@
</appender>
<!-- SQL logging -->
+<!--
<logger name="org.mmbase.QUERIES" additivity="false">
<level class="&mmlevel;" value ="trace" />
<appender-ref ref="sqllog" />
</logger>
+ -->
<!--
<logger name="eu.openimages" >
@@ -73,7 +75,7 @@
</logger>
<logger name="org.mmbase.streams" >
- <level class="&mmlevel;" value="info" />
+ <level class="&mmlevel;" value="debug" />
</logger>
<!--
Modified:
openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml
===================================================================
--- openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml
2009-09-14 12:12:58 UTC (rev 38598)
+++ openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml
2009-09-14 13:03:04 UTC (rev 38599)
@@ -12,13 +12,12 @@
<server max_simultaneous_transcoders="2" host="openbeelden2.tuxic.nl"
port="1679" />
-->
- <!--
+<!--
<transcoder>
<class name="org.mmbase.streams.transcoders.InfiniteTranscoder">
-
</class>
</transcoder>
- -->
+ -->
<recognizer label="source hi"
id="recognizer">
Modified: openimages/trunk/src/main/webapp/style/css/player.css
===================================================================
--- openimages/trunk/src/main/webapp/style/css/player.css 2009-09-14
12:12:58 UTC (rev 38598)
+++ openimages/trunk/src/main/webapp/style/css/player.css 2009-09-14
13:03:04 UTC (rev 38599)
@@ -15,6 +15,7 @@
{
width: 320px;
display: block;
+ margin-bottom: 6px;
}
#oiplayer.inavailable
@@ -23,7 +24,7 @@
height: 240px;
font-size: 1.1em;
background-image: url(../images/preview_video.png);
- margin-bottom: 4px;
+ margin-bottom: 6px;
}
#oiplayer.inavailable p
@@ -40,6 +41,7 @@
margin: 0;
padding: 0;
height: 240px;
+ margin-bottom: 6px;
}
ul.controls
Modified: openimages/trunk/src/main/webapp/test-regex.jsp
===================================================================
--- openimages/trunk/src/main/webapp/test-regex.jsp 2009-09-14 12:12:58 UTC
(rev 38598)
+++ openimages/trunk/src/main/webapp/test-regex.jsp 2009-09-14 13:03:04 UTC
(rev 38599)
@@ -150,6 +150,11 @@
<pre>
ffmpeg -i filename.ext
+Input #0, mpeg, from '3777.3747.mpg_beng_org.mpg':
+ Duration: 00:02:26.26, start: 31.444267, bitrate: 1374 kb/s
+ Stream #0.0[0x1e0]: Video: mpeg1video, yuv420p, 352x288 [PAR 178:163 DAR
1958:1467], 1152 kb/s, 25 tbr, 90k tbn, 25 tbc
+ Stream #0.1[0x1c0]: Audio: mp2, 44100 Hz, 2 channels, s16, 192 kb/s
+
Input #0, ogg, from 'matrix.ogg':
Duration: 00:00:46.65, start: 0.000000, bitrate: 766 kb/s
Stream #0.0: Invalid Codec type -1
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
