Remove libfaac

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6094 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 13 insertions, 15 deletions

diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m
index 80ad96c31..d65c01a65 100644
--- a/macosx/HBAudioController.m
+++ b/macosx/HBAudioController.m
@@ -396,7 +396,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
                    [NSArray arrayWithObject:
                     [NSDictionary dictionaryWithObjectsAndKeys:
                      [NSNumber numberWithInt: 1],     @"AudioTrack",
-                     @"AAC (faac)",                   @"AudioEncoder",
+                     @"AAC (CoreAudio)",              @"AudioEncoder",
                      @"Dolby Pro Logic II",           @"AudioMixdown",
                      @"Auto",                         @"AudioSamplerate",
                      @"160",                          @"AudioBitrate",
diff --git a/macosx/HBPresets.m b/macosx/HBPresets.m
index 3121c29c5..e47b7fd77 100644
--- a/macosx/HBPresets.m
+++ b/macosx/HBPresets.m
@@ -186,7 +186,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -302,7 +302,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -407,7 +407,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -512,7 +512,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -618,7 +618,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -734,7 +734,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -850,7 +850,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -966,7 +966,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"128"                         forKey:@"AudioBitrate"];
@@ -1071,7 +1071,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"128"                         forKey:@"AudioBitrate"];
@@ -1176,7 +1176,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"128"                         forKey:@"AudioBitrate"];
@@ -1281,7 +1281,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
@@ -1386,7 +1386,7 @@
     /* Track 1 */
     NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
     [audioTrack1Array setObject:[NSNumber numberWithInt:1]     forKey:@"AudioTrack"];
-    [audioTrack1Array setObject:@"AAC (faac)"                  forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"AAC (avcodec)"               forKey:@"AudioEncoder"];
     [audioTrack1Array setObject:@"Dolby Pro Logic II"          forKey:@"AudioMixdown"];
     [audioTrack1Array setObject:@"Auto"                        forKey:@"AudioSamplerate"];
     [audioTrack1Array setObject:@"160"                         forKey:@"AudioBitrate"];
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 7c80f16bd..621a2559e 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -283,7 +283,6 @@
 		277EFE8D17ED5628001D4A6A /* supplemental.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = supplemental.xcconfig; sourceTree = "<group>"; };
 		277EFE8F17ED7296001D4A6A /* libmp4v2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp4v2.a; path = external/contrib/lib/libmp4v2.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		277EFE9017ED72A1001D4A6A /* libmkv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmkv.a; path = external/contrib/lib/libmkv.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		277EFE9117ED7749001D4A6A /* libfaac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfaac.a; path = external/contrib/lib/libfaac.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		277EFE9217ED799E001D4A6A /* libfdk-aac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfdk-aac.a"; path = "../../../../Users/mike/Library/Developer/Xcode/DerivedData/HandBrake-anpxrfhxsejsxehiwuiaexjoygra/Build/Products/debug/external/contrib/lib/libfdk-aac.a"; sourceTree = "<group>"; };
 		27D6C72414B1019100B785E4 /* libhandbrake.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhandbrake.a; path = external/libhb/libhandbrake.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72814B102DA00B785E4 /* libass.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libass.a; path = external/contrib/lib/libass.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -688,7 +687,6 @@
 		277EFE8E17ED71A2001D4A6A /* Static Libraries (optional) */ = {
 			isa = PBXGroup;
 			children = (
-				277EFE9117ED7749001D4A6A /* libfaac.a */,
 				277EFE9217ED799E001D4A6A /* libfdk-aac.a */,
 				277EFE9017ED72A1001D4A6A /* libmkv.a */,
 				277EFE8F17ED7296001D4A6A /* libmp4v2.a */,