diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-05-31 23:28:42 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-05-31 23:28:42 -0700 |
| commit | 3c24d9476618496c8f2e1ca2f6025fa157120e43 (patch) | |
| tree | e3d8b381098affa3081cc95cd74ebeabef972ab3 /modules/gallery/helpers/movie.php | |
| parent | 463b3454ae7633815e24cdf86e81c57409dd15a9 (diff) | |
| parent | 79a05adb9d941671cefbdf6b1cc97f0cd84fabf3 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/movie.php')
| -rw-r--r-- | modules/gallery/helpers/movie.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 15225fe7..3aa40dc9 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -118,8 +118,7 @@ class movie_Core { $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($filename) . " 2>&1"; $result = `$cmd`; - if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+).*\ +([0-9\.]+) (fps|tb).*/", - $result, $regs)) { + if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+)/", $result, $regs)) { list ($width, $height) = array($regs[1], $regs[2]); } else { list ($width, $height) = array(0, 0); |