diff --git a/upload/admin_area/styles/cbv2/layout/video_manager.html b/upload/admin_area/styles/cbv2/layout/video_manager.html index 41e8e2d3..fcf31bb6 100644 --- a/upload/admin_area/styles/cbv2/layout/video_manager.html +++ b/upload/admin_area/styles/cbv2/layout/video_manager.html @@ -117,7 +117,7 @@ onmouseout="$('#vid_opt-{$videos[list].videoid}').hide()" >
{$videos[list].title|truncate:80} -
+ ({if $videos[list].duration>1}{$videos[list].duration|SetTime}{else}00:00{/if}) Featured:{$videos[list].featured} • Active:{$videos[list].active} • diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 59da54c0..86f90d08 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -3803,6 +3803,8 @@ 'libfaac' => 'Required for AAC Audio Conversion', // 'libfaad' => 'Required for AAC Audio Conversion', 'libx264' => 'Required for x264 video compression and conversion', + 'libtheora' => 'Theora is an open video codec being developed by the Xiph.org', + 'libvorbis' => 'Ogg Vorbis is a new audio compression format', ); $version = shell_output( get_binaries('ffmpeg').' -i xxx -acodec copy -vcodec copy -f null /dev/null 2>&1' ); preg_match_all("/enable\-(.*) /Ui",$version,$matches); @@ -3877,7 +3879,9 @@ { case 'ffmpeg': { - preg_match("/svn-r(.*),/iU",strtolower($result),$matches); + //echo $result; + preg_match("/svn-r([0-9]+)/i",strtolower($result),$matches); + //pr($matches); if(is_numeric(floatval($matches[1]))) { return $matches[1]; } else { diff --git a/upload/styles/cbv2new/layout/blocks/editor_pick/video_block.html b/upload/styles/cbv2new/layout/blocks/editor_pick/video_block.html index e93c1a1f..beb31447 100644 --- a/upload/styles/cbv2new/layout/blocks/editor_pick/video_block.html +++ b/upload/styles/cbv2new/layout/blocks/editor_pick/video_block.html @@ -1,11 +1,6 @@
{$video.title}