[cvs] commit: incubator/oscar/admin process.php process_all.php incubator/oscar/config conf.xml incubator/oscar/lib Convert.php Oscar.php incubator/oscar/lib/Convert ffmpeg.php mplayer.php incubator/oscar/po oscar.pot sl_SI.po incubator/oscar/scripts ...

[Duck]

duck        2007-10-08 16:43:30 EDT

  Modified files:
    oscar/admin          process.php process_all.php 
    oscar/config         conf.xml 
    oscar/lib            Convert.php Oscar.php 
    oscar/lib/Convert    ffmpeg.php mplayer.php 
    oscar/po             oscar.pot sl_SI.po 
    oscar/scripts        process.php 
    oscar/videos         edit.php 
  Added files:
    oscar/themes/graphics watermark.png 
  Log:
  Add watermark, currently adds horde logo on the left video corner.
  
  Revision  Changes    Path
  1.13      +6 -5      incubator/oscar/admin/process.php
  1.2       +6 -5      incubator/oscar/admin/process_all.php
  1.25      +4 -2      incubator/oscar/config/conf.xml
  1.6       +9 -4      incubator/oscar/lib/Convert.php
  1.18      +11 -2     incubator/oscar/lib/Convert/ffmpeg.php
  1.16      +11 -2     incubator/oscar/lib/Convert/mplayer.php
  1.96      +13 -6     incubator/oscar/lib/Oscar.php
  1.17      +28 -29    incubator/oscar/po/oscar.pot
  1.20      +28 -29    incubator/oscar/po/sl_SI.po
  1.3       +3 -3      incubator/oscar/scripts/process.php
  1.1       +4 -0      incubator/oscar/themes/graphics/watermark.png (new)
  1.17      +3 -3      incubator/oscar/videos/edit.php

  Chora Links:
  http://cvs.horde.org/diff.php/incubator/oscar/admin/process.php?r1=1.12&r2=1.13&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/admin/process_all.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/config/conf.xml?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert.php?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert/ffmpeg.php?r1=1.17&r2=1.18&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert/mplayer.php?r1=1.15&r2=1.16&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Oscar.php?r1=1.95&r2=1.96&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/po/oscar.pot?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/po/sl_SI.po?r1=1.19&r2=1.20&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/scripts/process.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/co.php/incubator/oscar/themes/graphics/watermark.png?r=1.1
  http://cvs.horde.org/diff.php/incubator/oscar/videos/edit.php?r1=1.16&r2=1.17&ty=u