vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed : FFMPEG version parse_version

Browse source 
Added : Duration in admin_area
Fixed : Editor's Pick
This commit is contained in:
Arslan Hassan 2010-07-20 13:16:22 +00:00
parent 1d61343cae
commit 095c289d2a
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
upload/admin_area/styles/cbv2/layout/video_manager.html
View file

@ -117,7 +117,7 @@
onmouseout="$('#vid_opt-{$videos[list].videoid}').hide()" >
<div><a href="edit_video.php?video={$videos[list].videoid}" target="_blank" style="text-indent:10px">
{$videos[list].title|truncate:80}
</a></div>
</a> ({if $videos[list].duration>1}{$videos[list].duration|SetTime}{else}00:00{/if})</div>
<span class="vdo_sets">
Featured:<strong>{$videos[list].featured} </strong> &#8226;
Active:<strong>{$videos[list].active}</strong> &#8226;

6
upload/includes/functions.php
View file

@ -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 {

5
upload/styles/cbv2new/layout/blocks/editor_pick/video_block.html
View file

@ -1,11 +1,6 @@
<div class="feature_heading">{$video.title}</div>
<div class="featured_video_player">
<div id="videoPlayer" class='video_player'>
This content requires JavaScript and Macromedia Flash Player 7 or higher. <a href=http://www.macromedia.com/go/getflash/>Get Flash</a><br/><br/>
</div>
<script language="javascript">
{FlashPlayer vdetails = $video height='250' width='440' }
</script>
</div>
<div class="featured_video_details">
<div style="float:left; width:50%">{lang code='views'} : {$video.views}</div><div style="float:right; width:50px">{show_rating class='rating' rating=$video.rating ratings=$video.rated_by total='10'}</div>