MacGui: Put AVI, OGM and Xvid out of our misery

- Note: renders custom presets using these obsolete (not an issue for built in presets as none have ever used them for good reason).

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

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index f56e622f7d8867e34df503e5483cf6645fe0250b..642a15fa45dc1decfc08251cac1550ad119b93b2 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -368,12 +368,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
        // MKV file
     menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"MKV file" action: NULL keyEquivalent: @""];
     [menuItem setTag: HB_MUX_MKV];
-    // AVI file
-    menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"AVI file" action: NULL keyEquivalent: @""];
-    [menuItem setTag: HB_MUX_AVI];
-    // OGM file
-    menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"OGM file" action: NULL keyEquivalent: @""];
-    [menuItem setTag: HB_MUX_OGM];
+    
     [fDstFormatPopUp selectItemAtIndex: 0];
     
     [self formatPopUpChanged:nil];
@@ -3829,8 +3824,6 @@ fWorkingCount = 0;
     menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"MPEG-4 (FFmpeg)" action: NULL keyEquivalent: @""];
     [menuItem setTag: HB_VCODEC_FFMPEG];
     
-    menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"MPEG-4 (XviD)" action: NULL keyEquivalent: @""];
-    [menuItem setTag: HB_VCODEC_XVID];
     switch( format )
     {
         case 0:
@@ -3864,25 +3857,7 @@ fWorkingCount = 0;
                        [fCreateChapterMarkers setEnabled: YES];
                        break;
             
-            case 2: 
-            ext = "avi";
-            /* Add additional video encoders here */
-            menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"H.264 (x264)" action: NULL keyEquivalent: @""];
-            [menuItem setTag: HB_VCODEC_X264];
-            /* We disable the create chapters checkbox here and make sure it is unchecked*/
-                       [fCreateChapterMarkers setEnabled: NO];
-                       [fCreateChapterMarkers setState: NSOffState];
-                       break;
-            
-            case 3:
-            ext = "ogm";
-            /* Add additional video encoders here */
-            menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"VP3 (Theora)" action: NULL keyEquivalent: @""];
-            [menuItem setTag: HB_VCODEC_THEORA];
-            /* We disable the create chapters checkbox here and make sure it is unchecked*/
-                       [fCreateChapterMarkers setEnabled: NO];
-                       [fCreateChapterMarkers setState: NSOffState];
-                       break;
+
     }
     /* if we have a previously selected vid encoder tag, then try to select it */
     if (selectedVidEncoderTag)