From: Alan J. Pippin Date: Sat, 21 Dec 2019 00:11:35 +0000 (-0700) Subject: Fixed bug in detecting brand on videos X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/%7Blink_visit%7D?a=commitdiff_plain;h=971083dc536b33ef5adaea547a2dc26c6cd6d903;p=videoscripts%2F.git Fixed bug in detecting brand on videos --- diff --git a/merge_videos_by_day b/merge_videos_by_day index 0737ee1..dd0d1ca 100755 --- a/merge_videos_by_day +++ b/merge_videos_by_day @@ -176,8 +176,8 @@ foreach $dstfile (sort keys %videos) { print "$cmd\n"; if(!defined $opt_k) { foreach $video (@{$videos{$dstfile}}) { - if($opt_v) { print " $ffmpeg -i \"$video\" 2>&1 | grep \"compatible_brands\" | tail -n 1\n"; } - my $brands=`$ffmpeg -i "$video" 2>&1 | grep "compatible_brands" | tail -n 1`; chomp($brands); + if($opt_v) { print " $ffmpeg -i $video 2>&1 | grep \"compatible_brands\" | tail -n 1\n"; } + my $brands=`$ffmpeg -i $video 2>&1 | grep "compatible_brands" | tail -n 1`; chomp($brands); if(($save_originals) && ($video =~ /\.$originals_file_ext/) && (!$brands || $brands !~ /$originals_no_copy_brands/)) { print "-> Saving the original video $video\n"; if(index($video, basename(dirname($video))) == -1) { @@ -207,8 +207,8 @@ foreach $dstfile (sort keys %videos) { # Remove the individual video files if(!defined $opt_k) { foreach $srcvideo (@{$videos{$dstfile}}) { - if($opt_v) { print " $ffmpeg -i \"$srcvideo\" 2>&1 | grep \"compatible_brands\" | tail -n 1\n"; } - my $brands=`$ffmpeg -i "$srcvideo" 2>&1 | grep "compatible_brands" | tail -n 1`; chomp($brands); + if($opt_v) { print " $ffmpeg -i $srcvideo 2>&1 | grep \"compatible_brands\" | tail -n 1\n"; } + my $brands=`$ffmpeg -i $srcvideo 2>&1 | grep "compatible_brands" | tail -n 1`; chomp($brands); if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/) && (!$brands || $brands !~ /$originals_no_copy_brands/)) { print "-> Saving the original video $srcvideo to $origpathname\n"; if(index($srcvideo, basename(dirname($srcvideo))) == -1) {