mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
24 lines
1.2 KiB
Plaintext
24 lines
1.2 KiB
Plaintext
--- dvd-slideshow.orig 2008-12-05 07:48:58.000000000 +0000
|
|
+++ dvd-slideshow 2009-04-13 11:10:55.000000000 +0000
|
|
@@ -3845,7 +3845,7 @@
|
|
mkdir -p "$outdir/$newname"_pics
|
|
fi
|
|
if [ "$copy" -eq 1 ] ; then
|
|
- cp -af "${image[$i]}" "$outdir/$newname"_pics
|
|
+ cp -pf "${image[$i]}" "$outdir/$newname"_pics
|
|
fi
|
|
moviefiles=$(( $moviefiles + 1 ))
|
|
elif [ "${filetype[$i]}" == 'ogg' ] || [ "${filetype[$i]}" == 'mp3' ] || [ "${filetype[$i]}" == 'wav' ] || [ "${image[$i]}" == 'silence' ] || [ "${filetype[$i]}" == 'm4a' ] || [ "${filetype[$i]}" == 'aac' ] ; then
|
|
@@ -7136,9 +7136,9 @@
|
|
mv "$tmpdir/video1.flv" "$outdir"/"$slideshow_name".flv
|
|
myecho "[dvd-slideshow] Generating video thumbnail..."
|
|
ffmpeg -y -i "$outdir"/"$slideshow_name".flv -f mjpeg -t 0.001 "$outdir"/"$slideshow_name".jpg >> "$ffmpeg_out" 2>&1
|
|
- if [ -f "/usr/bin/flvtool2" ] ; then
|
|
+ if [ -f "/usr/local/bin/flvtool2" ] ; then
|
|
myecho "[dvd-slideshow] Running flvtool2 -U $slideshow_name".flv
|
|
- /usr/bin/flvtool2 -U "$outdir"/"$slideshow_name".flv
|
|
+ /usr/local/bin/flvtool2 -U "$outdir"/"$slideshow_name".flv
|
|
fi
|
|
elif [ "$output_format" == 'swf' ] ; then
|
|
myecho "[dvd-slideshow] Adding audio to .swf file"
|