projects
/
videoscripts
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
eb8eb0b
)
Fixed bug in detecting brand on videos
author
Alan J. Pippin
<alan@pippins.net>
Sat, 21 Dec 2019 00:11:35 +0000
(17:11 -0700)
committer
Alan J. Pippin
<ajp@pippins.net>
Sat, 21 Dec 2019 00:11:35 +0000
(17:11 -0700)
merge_videos_by_day
patch
|
blob
|
history
diff --git
a/merge_videos_by_day
b/merge_videos_by_day
index 0737ee128484420b439dd46474701685923ce639..dd0d1caed6f01ef7bde9a9b6da139602c71ea067 100755
(executable)
--- 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}}) {
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) {
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}}) {
# 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) {
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) {