[SCM] dvd-slideshow/master: Refresh 03-toolame.diff

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 430e2531ca52d430ac81d38e206dc223772140c4
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Sat Jan 16 11:05:59 2016 +0000

    Refresh 03-toolame.diff

diff --git a/debian/patches/03-toolame.diff b/debian/patches/03-toolame.diff
index b00d016..8371852 100644
--- a/debian/patches/03-toolame.diff
+++ b/debian/patches/03-toolame.diff
@@ -6,8 +6,8 @@ Description: Use twolame instead of toolame.
 
 --- dvd-slideshow.orig/dvd-menu
 +++ dvd-slideshow/dvd-menu
-@@ -1679,19 +1679,19 @@ echo "song=$audiofile"
- 	        	ffmpeg -i "$tmpdir/fade_audio.wav" -vn -y -ab "$audio_bitrate"k -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/fade_audio.ac3" >> "$logfile" 2>&1
+@@ -1687,19 +1687,19 @@ echo "song=$audiofile"
+ 	        	ffmpeg -i "$tmpdir/fade_audio.wav" -vn -y -ab "$audio_bitrate"k -acodec ac3_fixed -ar $audio_sample_rate -ac 6 "$tmpdir/fade_audio.ac3" >> "$logfile" 2>&1
  		fi
  	else
 -		## toolame is way faster! (3x in my test)
@@ -36,7 +36,7 @@ Description: Use twolame instead of toolame.
  		else
 --- dvd-slideshow.orig/dvd-slideshow
 +++ dvd-slideshow/dvd-slideshow
-@@ -6876,18 +6876,18 @@ if [ -n "${passed_audio[0]}" ] ; then  #
+@@ -6940,18 +6940,18 @@ if [ -n "${passed_audio[0]}" ] ; then  #
  			cleanup; exit 1
  		fi
  	else
@@ -63,7 +63,7 @@ Description: Use twolame instead of toolame.
  				fi
  			fi
  		else
-@@ -7125,18 +7125,18 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
+@@ -7189,18 +7189,18 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
  		fi
  		
  		if [ "$output_format" == 'mpg' ] || [ "$output_format" == "mpeg2" ] ; then 
@@ -90,7 +90,7 @@ Description: Use twolame instead of toolame.
  					fi
  				fi
  			else
-@@ -7355,18 +7355,18 @@ if [ -n "${audio_2[0]}" ] ; then   ## au
+@@ -7419,18 +7419,18 @@ if [ -n "${audio_2[0]}" ] ; then   ## au
  			cleanup; exit 1
  		fi
  	else

-- 
dvd-slideshow packaging