diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2012-05-05 19:19:04 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2012-05-05 19:19:04 -0700 |
| commit | d5a445b7797a8f46a171bb94f3fd9d48d95494e1 (patch) | |
| tree | c56bb430ef1949b3557c3317ce47c12f326bff03 /modules/gallery | |
| parent | 801c9a98e438a9c6a072630c3a051435986f6cf0 (diff) | |
Improve the dimensions-detecting regex, thanks to cchiappa.
Fixes #1844.
Diffstat (limited to 'modules/gallery')
| -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); |