From d5a445b7797a8f46a171bb94f3fd9d48d95494e1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 5 May 2012 19:19:04 -0700
Subject: Improve the dimensions-detecting regex, thanks to cchiappa. Fixes
 #1844.

---
 modules/gallery/helpers/movie.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

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);
-- 
cgit v1.2.3