[Pkg-owncloud-commits] [owncloud] 50/111: Merge pull request #5767 from owncloud/moviepreviewfallback

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 6ef39931cb484286e7bb7bcd8373060d3a8a5ffc
Merge: 57a3141 617dc0e
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Thu Nov 14 16:39:39 2013 -0800

    Merge pull request #5767 from owncloud/moviepreviewfallback
    
    Added ffmpeg fallback when avconv is not available

 lib/private/preview/movies.php |   60 ++++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 12 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git