[cvs] commit: incubator/oscar/config conf.xml incubator/oscar/lib Oscar.php incubator/oscar/lib/Convert ffmpeg.php

[Michael Rubinsky]

mrubinsk    2007-09-12 19:37:45 EDT

  Modified files:
    oscar/config         conf.xml 
    oscar/lib            Oscar.php 
    oscar/lib/Convert    ffmpeg.php 
  Log:
  Remove supported mime type configuration, and simply check for a video/* MIME type - or try some magic if it's application/octet-stream
  - mencoder/ffmpeg both support all major video types out of the box
  - the config won't prevent users from uploading an unsupported type
  - we can check the results of the conversion / existence or size of resulting flv file for success.
  - you can't depend on any single MIME type for a particular format anyway, as different platforms/browsers will send different types.
  
  ...also fixed some existence checks and variable definitions.
  
  Revision  Changes    Path
  1.8       +1 -13     incubator/oscar/config/conf.xml
  1.6       +9 -7      incubator/oscar/lib/Convert/ffmpeg.php
  1.21      +17 -4     incubator/oscar/lib/Oscar.php

  Chora Links:
  http://cvs.horde.org/diff.php/incubator/oscar/config/conf.xml?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Convert/ffmpeg.php?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/incubator/oscar/lib/Oscar.php?r1=1.20&r2=1.21&ty=u