diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-05-12 13:06:18 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-05-12 13:06:18 +0000 |
| commit | f5098f54b8279f468d94747b1156e15ea05d6d25 (patch) | |
| tree | 2ecfb6663887ffbc72de8f231864b6c78bd62640 /modules/gallery/helpers/movie.php | |
| parent | a13fd7f373f3718037a2ce90a3cb408f24856602 (diff) | |
| parent | d1390bd87db1a7e59bbd72f5991fbbc6374c98b4 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 79b5a7c2..b54811df 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -106,7 +106,7 @@ class movie_Core { $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($file_path) . " 2>&1"; $result = `$cmd`; - if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+)/", $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); |