Index: convert.conf
===================================================================
--- convert.conf	(revision 11267)
+++ convert.conf	(working copy)
@@ -42,10 +42,10 @@
 # specific combinations match before wildcards
 
 mov mp3 * *
-	[mov123] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ -b $BITRATE$ -r - -
+	[mov123] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ -abr $BITRATE$ -r - -
 
 alc mp3 * *
-	[alac] -r $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ -b $BITRATE$ -r -x - -
+	[alac] -r $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ -abr $BITRATE$ -r -x - -
 
 ogg mp3 * *
 	[sox] -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ - | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r - -
Index: Slim/Player/TranscodingHelper.pm
===================================================================
--- Slim/Player/TranscodingHelper.pm	(revision 11267)
+++ Slim/Player/TranscodingHelper.pm	(working copy)
@@ -287,7 +287,7 @@
 		}
 
 		# only finish if the rate isn't over the limit
-		if ($command && (!defined($client) || underMax($client, $url, $format))) {
+		if ($command && (!defined($client) || underMax($client, $url, $format, $checkFormat))) {
 			last;
 		}
 	}
@@ -363,12 +363,19 @@
 }
 
 sub underMax {
-	my $client   = shift;
-	my $fullpath = shift;
-	my $type     = shift || Slim::Music::Info::contentType($fullpath);
+	my $client     = shift;
+	my $fullpath   = shift;
+	my $type       = shift || Slim::Music::Info::contentType($fullpath);
+	my $outputType = shift;
 
 	my $maxRate  = Slim::Utils::Prefs::maxRate($client);
 
+	# Bug 4707 - Sanity check:
+	# If maxRate is 0 and the output format is mp3, force 320 limit instead of no limit
+	if ($maxRate == 0 && defined $outputType && $outputType eq 'mp3') {
+		$maxRate = 320;
+	}
+
 	# If we're not rate limited, we're under the maximum.
 	# If we don't have lame, we can't transcode, so we
 	# fall back to saying we're under the maximum.