diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-05-31 12:53:03 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-05-31 12:53:03 -0700 |
commit | 181c97ef4b29bb3c68a6c9b5d2f8165e8b44ba29 (patch) | |
tree | 123579dd2a260af1d20d318970d58f74f64461bf /modules | |
parent | f9a741782da848c707ac0a122c35e86061a0fbb2 (diff) |
Relax the regex we use to extract the movie size so that it works with
the new version of ffmpeg that I have on my dev box (ffmpeg
0.5-svn17737+3:0.svn20090303-1)
Diffstat (limited to 'modules')
-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); |