diff options
| author | Silvio <silvio@devlet.com.br> | 2011-07-12 10:26:40 -0300 |
|---|---|---|
| committer | Silvio <silvio@devlet.com.br> | 2011-07-12 10:26:40 -0300 |
| commit | 84a089eb09ab21d5062faa3b4021f95da930caaf (patch) | |
| tree | 04e6efe1d61c0dce3f5c526ab184e89588d7a878 /libraries/phpvideotoolkit/README | |
| parent | d598b738b366190db350b95cebb1e1cf0e1c54c6 (diff) | |
| parent | b2eb0df792e7724538c4afeb7d8929a241a03773 (diff) | |
| download | video-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.gz video-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.bz2 | |
Merge branch '7.x-1.x' of http://git.drupal.org/project/video into 7.x-1.x
Conflicts:
transcoders/video_ffmpeg_php.inc
Diffstat (limited to 'libraries/phpvideotoolkit/README')
| -rw-r--r-- | libraries/phpvideotoolkit/README | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libraries/phpvideotoolkit/README b/libraries/phpvideotoolkit/README deleted file mode 100644 index 6498fb8..0000000 --- a/libraries/phpvideotoolkit/README +++ /dev/null @@ -1,36 +0,0 @@ ------------ -ABOUT ------------ -The new home of ffmpeg is located at Sourceforge. Whilst I will make every effort to update -the files at every location it is updated you should always check the Sourceforge repository -for the latest version. - -http://sourceforge.net/projects/phpvideotoolkit - ------------ -INSTALL ------------ -See INSTALL for help installing ffmpeg and the other binaries. - ------------ -DEMOS ------------ -See DEMOS for more information about ffmpeg demos - ------------ -CHANGES ------------ -See CHANGELOG for version changes. - ------------ -LICENSE ------------ -The PHPVideoToolkit class, the VideoTo adapter class, the FFmpeg-PHP adapter classes and all -associated examples are subject to the a BSD license. See LICENSE for full information. - - -Regards, -bugged - - -/* SVN FILE: $Id$ */ |