Merge branch '7.x-1.x' of git.drupal.org:project/video into 7.x-1.x

41 files changed, 0 insertions, 51 deletions

diff --git a/libraries/phpvideotoolkit/examples/working/processed/audio/MOV00007.mp3 b/libraries/phpvideotoolkit/examples/working/processed/audio/MOV00007.mp3
deleted file mode 100644
index cd7c0a1..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/audio/MOV00007.mp3
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/audio/cat.mp3 b/libraries/phpvideotoolkit/examples/working/processed/audio/cat.mp3
deleted file mode 100644
index 2faf439..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/audio/cat.mp3
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007.jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007.jpg
deleted file mode 100644
index ea165be..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007.jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV000071.jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV000071.jpg
deleted file mode 100644
index ea165be..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV000071.jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-00-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-00-0].jpg
deleted file mode 100644
index 0b4a722..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-00-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-01-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-01-0].jpg
deleted file mode 100644
index 6f2f8cd..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-01-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-02-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-02-0].jpg
deleted file mode 100644
index 7b9e4a9..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-02-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-03-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-03-0].jpg
deleted file mode 100644
index cc1d5a7..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-03-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-04-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-04-0].jpg
deleted file mode 100644
index b734a78..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-04-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-05-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-05-0].jpg
deleted file mode 100644
index 3c1c9f5..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-05-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-06-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-06-0].jpg
deleted file mode 100644
index 4a4a36a..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-06-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-07-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-07-0].jpg
deleted file mode 100644
index 13c30d8..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-07-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-08-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-08-0].jpg
deleted file mode 100644
index 3b37ded..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-08-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-09-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-09-0].jpg
deleted file mode 100644
index 45fafd0..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-09-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-10-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-10-0].jpg
deleted file mode 100644
index 62349ed..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/MOV00007[0-00-10-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000.jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000.jpg
deleted file mode 100644
index c185b78..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000.jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video0001.jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video0001.jpg
deleted file mode 100644
index c185b78..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video0001.jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-00-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-00-0].jpg
deleted file mode 100644
index 32f121b..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-00-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-01-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-01-0].jpg
deleted file mode 100644
index bdfc125..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-01-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-02-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-02-0].jpg
deleted file mode 100644
index c5b3a6f..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-02-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-03-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-03-0].jpg
deleted file mode 100644
index 7b96867..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-03-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-04-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-04-0].jpg
deleted file mode 100644
index f5a4af1..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-04-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-05-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-05-0].jpg
deleted file mode 100644
index f88f194..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-05-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-06-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-06-0].jpg
deleted file mode 100644
index 2ea7e24..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-06-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-07-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-07-0].jpg
deleted file mode 100644
index 8a0d508..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-07-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-08-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-08-0].jpg
deleted file mode 100644
index d3734f6..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/Video000[0-00-08-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat.jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat.jpg
deleted file mode 100644
index 65f8707..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat.jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat1.jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat1.jpg
deleted file mode 100644
index 65f8707..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat1.jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-00-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-00-0].jpg
deleted file mode 100644
index feb5004..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-00-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-01-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-01-0].jpg
deleted file mode 100644
index e6fb0b4..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-01-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-02-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-02-0].jpg
deleted file mode 100644
index f81fe03..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-02-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-03-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-03-0].jpg
deleted file mode 100644
index 7a63700..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-03-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-04-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-04-0].jpg
deleted file mode 100644
index ed110fe..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-04-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-05-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-05-0].jpg
deleted file mode 100644
index d4591b3..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-05-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-06-0].jpg b/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-06-0].jpg
deleted file mode 100644
index e34734b..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/thumbnails/cat[0-00-06-0].jpg
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/videos/MOV00007.flv b/libraries/phpvideotoolkit/examples/working/processed/videos/MOV00007.flv
deleted file mode 100644
index e48399c..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/videos/MOV00007.flv
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/videos/MOV00007.log b/libraries/phpvideotoolkit/examples/working/processed/videos/MOV00007.log
deleted file mode 100644
index 4384f16..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/videos/MOV00007.log
+++ /dev/null
@@ -1,17 +0,0 @@
-'C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\' is not recognized as an internal or external command,
-operable program or batch file.
--------------------------------
-FFMPEG OUTPUT
--------------------------------
--------------------------------
-COMMAND
--------------------------------
-C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\ -i "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\MOV00007.3gp" -f "mp4" -ar "44100" -ab "128k" -vcodec "mpeg4" -r "29.7" -mbd "2" -flags "+4mv+trell" -aic "2" -cmp "2" -subcmp "2" -title "MOV00007"  -y /tmp/1300222621-4d7fd29d5ecfc.mp4
--------------------------------
-RESULT
--------------------------------
-Execute error. Output for file "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\MOV00007.3gp" was not found. Please check server write permissions and/or available codecs compiled with FFmpeg. You can check the encode decode availability by inspecting the output array from PHPVideoToolkit::getFFmpegInfo().
--------------------------------
-COMMAND
--------------------------------
-C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\ -i "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\MOV00007.3gp" -f "mp4" -ar "44100" -ab "128k" -vcodec "mpeg4" -r "29.7" -mbd "2" -flags "+4mv+trell" -aic "2" -cmp "2" -subcmp "2" -title "MOV00007"  -y /tmp/1300222621-4d7fd29d5ecfc.mp4
diff --git a/libraries/phpvideotoolkit/examples/working/processed/videos/Video000.flv b/libraries/phpvideotoolkit/examples/working/processed/videos/Video000.flv
deleted file mode 100644
index c2ddab4..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/videos/Video000.flv
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/videos/Video000.log b/libraries/phpvideotoolkit/examples/working/processed/videos/Video000.log
deleted file mode 100644
index 8692ebf..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/videos/Video000.log
+++ /dev/null
@@ -1,17 +0,0 @@
-'C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\' is not recognized as an internal or external command,
-operable program or batch file.
--------------------------------
-FFMPEG OUTPUT
--------------------------------
--------------------------------
-COMMAND
--------------------------------
-C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\ -i "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\Video000.3gp" -f "mp4" -ar "44100" -ab "128k" -vcodec "mpeg4" -r "29.7" -mbd "2" -flags "+4mv+trell" -aic "2" -cmp "2" -subcmp "2" -title "Video000"  -y /tmp/1300222621-4d7fd29d7bb7e.mp4
--------------------------------
-RESULT
--------------------------------
-Execute error. Output for file "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\Video000.3gp" was not found. Please check server write permissions and/or available codecs compiled with FFmpeg. You can check the encode decode availability by inspecting the output array from PHPVideoToolkit::getFFmpegInfo().
--------------------------------
-COMMAND
--------------------------------
-C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\ -i "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\Video000.3gp" -f "mp4" -ar "44100" -ab "128k" -vcodec "mpeg4" -r "29.7" -mbd "2" -flags "+4mv+trell" -aic "2" -cmp "2" -subcmp "2" -title "Video000"  -y /tmp/1300222621-4d7fd29d7bb7e.mp4
diff --git a/libraries/phpvideotoolkit/examples/working/processed/videos/cat.flv b/libraries/phpvideotoolkit/examples/working/processed/videos/cat.flv
deleted file mode 100644
index bb49705..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/videos/cat.flv
+++ /dev/null
diff --git a/libraries/phpvideotoolkit/examples/working/processed/videos/cat.log b/libraries/phpvideotoolkit/examples/working/processed/videos/cat.log
deleted file mode 100644
index 5228554..0000000
--- a/libraries/phpvideotoolkit/examples/working/processed/videos/cat.log
+++ /dev/null
@@ -1,17 +0,0 @@
-'C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\' is not recognized as an internal or external command,
-operable program or batch file.
--------------------------------
-FFMPEG OUTPUT
--------------------------------
--------------------------------
-COMMAND
--------------------------------
-C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\ -i "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\cat.mpeg" -f "mp4" -ar "44100" -ab "128k" -vcodec "mpeg4" -r "29.7" -mbd "2" -flags "+4mv+trell" -aic "2" -cmp "2" -subcmp "2" -title "cat"  -y /tmp/1300222621-4d7fd29d9844b.mp4
--------------------------------
-RESULT
--------------------------------
-Execute error. Output for file "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\cat.mpeg" was not found. Please check server write permissions and/or available codecs compiled with FFmpeg. You can check the encode decode availability by inspecting the output array from PHPVideoToolkit::getFFmpegInfo().
--------------------------------
-COMMAND
--------------------------------
-C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\tmp\ -i "C:\projects\schlitterbahn\sites\all\modules\video\libraries\phpvideotoolkit\examples\working\to-be-processed\cat.mpeg" -f "mp4" -ar "44100" -ab "128k" -vcodec "mpeg4" -r "29.7" -mbd "2" -flags "+4mv+trell" -aic "2" -cmp "2" -subcmp "2" -title "cat"  -y /tmp/1300222621-4d7fd29d9844b.mp4