Upgrade AAC to a full-fledge partner

encode.pl

@@ -265,7 +265,6 @@ sub audioOptions($) {
 			}
 		} elsif ($codec =~ /AAC/i) {
 			push(@aac, $track->{'index'});
-			$aac = $track->{'index'};
 			if ($DEBUG) {
 				print STDERR 'Found AAC in track ' . $track->{'index'} . "\n";
 			}
@@ -359,6 +358,16 @@ sub audioOptions($) {
 		}
 	}
 
+	# Always keep AAC if we found it (and liked it)
+	# Passthru would be great, but HandBrake does not do AAC passthru
+	foreach my $aac_track (@aac) {
+		if ($DEBUG) {
+			print STDERR 'Keeping AAC track as CoreAudio AAC: ' . $aac_track . "\n";
+		}
+		my %track = ('index' => $aac_track, 'encoder' => 'ca_aac');
+		push(@audio_tracks, \%track);
+	}
+
 	# Always keep PCM if we found it (but recode to AAC)
 	foreach my $pcm_track (@pcm) {
 		if ($DEBUG) {