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

1 files changed, 2 insertions, 6 deletions

diff --git a/test/test.c b/test/test.c
index 3c93cecd5..ab08750e2 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1962,8 +1962,8 @@ static void ShowHelp()
 
 
     "### Video Options------------------------------------------------------------\n\n"
-    "    -e, --encoder <string>  Set video library encoder (ffmpeg,xvid,\n"
-    "                            x264,theora default: ffmpeg)\n"
+    "    -e, --encoder <string>  Set video library encoder (ffmpeg,x264,theora)\n"
+    "                            (default: ffmpeg)\n"
     "    -x, --x264opts <string> Specify advanced x264 options in the\n"
     "                            same style as mencoder:\n"
     "                            option1=value1:option2=value2\n"
@@ -2470,10 +2470,6 @@ static int ParseOptions( int argc, char ** argv )
                 {
                     vcodec = HB_VCODEC_FFMPEG;
                 }
-                else if( !strcasecmp( optarg, "xvid" ) )
-                {
-                    vcodec = HB_VCODEC_XVID;
-                }
                 else if( !strcasecmp( optarg, "x264" ) )
                 {
                     vcodec = HB_VCODEC_X264;