Excises xvid from libhb because it's not worthy. Having two different MPEG-4 Part 2 encoders is superfluous and when choosing between ffmpeg and xvid, xvid is the clear loser since we need to keep ffmpeg around for other functions and xvid constantly requires attention to ensure it compiles.

MacGui: Removes some stray references to the codec and unlinks it from the Xcode project.
CLI: Removes references to the codec and removes it as a dependency.

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

2 files changed, 2 insertions, 23 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 9e58356ac..339945b83 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -395,7 +395,6 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     /* Video encoder */
     [fVidEncoderPopUp removeAllItems];
     [fVidEncoderPopUp addItemWithTitle: @"FFmpeg"];
-    [fVidEncoderPopUp addItemWithTitle: @"XviD"];
     
     
     
@@ -4200,8 +4199,8 @@ the user is using "Custom" settings by determining the sender*/
             qpRFLabelString = @"RF:";
         }
     }
-    /* ffmpeg and xvid 1-31 */
-    if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_FFMPEG || [[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_XVID)
+    /* ffmpeg  1-31 */
+    if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_FFMPEG )
     {
         [fVidQualitySlider setMinValue:1.0];
         [fVidQualitySlider setMaxValue:31.0];
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index fefcd4a56..1ecd536a2 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -711,7 +711,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -742,7 +741,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -808,7 +806,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -845,7 +842,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -932,7 +928,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -969,7 +964,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1056,7 +1050,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1093,7 +1086,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1180,7 +1172,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1217,7 +1208,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1307,7 +1297,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1344,7 +1333,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1434,7 +1422,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1471,7 +1458,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1561,7 +1547,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1598,7 +1583,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1688,7 +1672,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1725,7 +1708,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1824,7 +1806,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1866,7 +1847,6 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
-					"$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (