Index: test/test.c =================================================================== --- test/test.c (revision 1261) +++ test/test.c (working copy) @@ -1166,7 +1166,7 @@ " -d, --deinterlace Deinterlace video with yadif/mcdeint filter\n" " (default 0:-1:-1:1)\n" " or\n" - " \n" + " \n" " -7, --deblock Deblock video with pp7 filter\n" " (default 0:2)\n" " -8, --denoise Denoise video with hqdn3d filter\n" @@ -1468,16 +1468,12 @@ } else if (!( strcmp( optarg, "slow" ) )) { - deinterlace_opt = "0"; + deinterlace_opt = "2"; } else if (!( strcmp( optarg, "slower" ) )) { - deinterlace_opt = "2:-1:1"; + deinterlace_opt = "0"; } - else if (!( strcmp( optarg, "slowest" ) )) - { - deinterlace_opt = "1:-1:1"; - } else { deinterlace_opt = strdup( optarg ); Index: macosx/PictureController.mm =================================================================== --- macosx/PictureController.mm (revision 1261) +++ macosx/PictureController.mm (working copy) @@ -126,7 +126,6 @@ [fDeinterlacePopUp addItemWithTitle: @"Fast"]; [fDeinterlacePopUp addItemWithTitle: @"Slow"]; [fDeinterlacePopUp addItemWithTitle: @"Slower"]; - [fDeinterlacePopUp addItemWithTitle: @"Slowest"]; /* Set deinterlaces level according to the integer in the main window */ [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace]; Index: macosx/Controller.mm =================================================================== --- macosx/Controller.mm (revision 1261) +++ macosx/Controller.mm (working copy) @@ -1580,28 +1580,22 @@ /* Deinterlace */ if ([fPictureController deinterlace] == 1) { - /* Run old deinterlacer by default */ + /* Run old deinterlacer fd by default */ hb_filter_deinterlace.settings = "-1"; hb_list_add( job->filters, &hb_filter_deinterlace ); } else if ([fPictureController deinterlace] == 2) { - /* Yadif mode 0 (1-pass with spatial deinterlacing.) */ - hb_filter_deinterlace.settings = "0"; + /* Yadif mode 0 (without spatial deinterlacing.) */ + hb_filter_deinterlace.settings = "2"; hb_list_add( job->filters, &hb_filter_deinterlace ); } else if ([fPictureController deinterlace] == 3) { - /* Yadif (1-pass w/o spatial deinterlacing) and Mcdeint */ - hb_filter_deinterlace.settings = "2:-1:1"; + /* Yadif (with spatial deinterlacing) and Mcdeint */ + hb_filter_deinterlace.settings = "0"; hb_list_add( job->filters, &hb_filter_deinterlace ); } - else if ([fPictureController deinterlace] == 4) - { - /* Yadif (2-pass w/ spatial deinterlacing) and Mcdeint*/ - hb_filter_deinterlace.settings = "1:-1:1"; - hb_list_add( job->filters, &hb_filter_deinterlace ); - } /* Denoise */ @@ -2642,10 +2636,6 @@ { [fPicSettingDeinterlace setStringValue: @"Slower"]; } - else if ([fPictureController deinterlace] ==4) - { - [fPicSettingDeinterlace setStringValue: @"Slowest"]; - } /* Denoise */ if ([fPictureController denoise] == 0) {