OSDN Git Service

MacGui: Allow up to 320 kbps bitrate for stereo and 768 kbps for 6 channel discrete...
[handbrake-jp/handbrake-jp-git.git] / test / test.c
index 8019de2..4cd8c5c 100644 (file)
@@ -9,11 +9,20 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
+#include <inttypes.h>
+
+#if defined( __MINGW32__ )
+#include <conio.h>
+#endif
+
+#if defined( PTW32_STATIC_LIB )
+#include <pthread.h>
+#endif
 
 #include "hb.h"
 #include "parsecsv.h"
 
-#ifdef __APPLE_CC__
+#if defined( __APPLE_CC__ )
 #import <CoreServices/CoreServices.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOMedia.h>
 #endif
 
 /* Options */
-static int    debug       = HB_DEBUG_NONE;
+static int    debug       = HB_DEBUG_ALL;
 static int    update      = 0;
+static int    dvdnav      = 1;
 static char * input       = NULL;
 static char * output      = NULL;
 static char * format      = NULL;
 static int    titleindex  = 1;
+static int    titlescan   = 0;
 static int    longest_title = 0;
-static int    subtitle_scan = 0;
-static int    subtitle_force = 0;
 static char * native_language = NULL;
+static int    native_dub  = 0;
 static int    twoPass     = 0;
 static int    deinterlace           = 0;
 static char * deinterlace_opt       = 0;
@@ -42,6 +52,8 @@ static int    detelecine            = 0;
 static char * detelecine_opt        = 0;
 static int    decomb                = 0;
 static char * decomb_opt            = 0;
+static int    rotate                = 0;
+static char * rotate_opt            = 0;
 static int    grayscale   = 0;
 static int    vcodec      = HB_VCODEC_FFMPEG;
 static int    h264_13     = 0;
@@ -55,10 +67,20 @@ static char * atracks     = NULL;
 static char * arates      = NULL;
 static char * abitrates   = NULL;
 static char * acodecs     = NULL;
+static char * anames      = NULL;
 static int    default_acodec = HB_ACODEC_FAAC;
-static int    default_arate = 48000;
 static int    default_abitrate = 160;
-static int    sub         = 0;
+static int    audio_explicit = 0;
+static char ** subtracks   = NULL;
+static char ** subforce    = NULL;
+static char * subburn     = NULL;
+static char * subdefault  = NULL;
+static char ** srtfile     = NULL;
+static char ** srtcodeset  = NULL;
+static char ** srtoffset   = NULL;
+static char ** srtlang     = NULL;
+static int     srtdefault  = -1;
+static int    subtitle_scan = 0;
 static int    width       = 0;
 static int    height      = 0;
 static int    crop[4]     = { -1,-1,-1,-1 };
@@ -68,29 +90,42 @@ static float  vquality    = -1.0;
 static int    vbitrate    = 0;
 static int    size        = 0;
 static int    mux         = 0;
-static int    pixelratio  = 0;
-static int    loosePixelratio = 0;
+static int    anamorphic_mode  = 0;
 static int    modulus       = 0;
 static int    par_height    = 0;
 static int    par_width     = 0;
+static int    display_width = 0;
+static int    keep_display_aspect = 0;
+static int    itu_par       = 0;
+static int    angle = 0;
 static int    chapter_start = 0;
 static int    chapter_end   = 0;
 static int    chapter_markers = 0;
 static char * marker_file   = NULL;
-static int       crf                   = 1;
 static char      *x264opts             = NULL;
 static char      *x264opts2    = NULL;
 static int       maxHeight             = 0;
 static int       maxWidth              = 0;
 static int    turbo_opts_enabled = 0;
-static char * turbo_opts = "ref=1:subme=1:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
+static char * turbo_opts = "ref=1:subme=2:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
 static int    largeFileSize = 0;
 static int    preset        = 0;
 static char * preset_name   = 0;
-static int    vfr           = 0;
 static int    cfr           = 0;
 static int    mp4_optimize  = 0;
 static int    ipod_atom     = 0;
+static int    color_matrix  = 0;
+static int    preview_count = 10;
+static int    store_previews = 0;
+static int    start_at_preview = 0;
+static int64_t start_at_pts    = 0;
+static int    start_at_frame = 0;
+static char * start_at_string = NULL;
+static char * start_at_token = NULL;
+static int64_t stop_at_pts    = 0;
+static int    stop_at_frame = 0;
+static char * stop_at_string = NULL;
+static char * stop_at_token = NULL;
 
 /* Exit cleanly on Ctrl-C */
 static volatile int die = 0;
@@ -113,7 +148,7 @@ static char* bsd_name_for_path(char *path);
 static int device_is_dvd(char *device);
 static io_service_t get_iokit_service( char *device );
 static int is_dvd_service( io_service_t service );
-static is_whole_media_service( io_service_t service );
+static int is_whole_media_service( io_service_t service );
 #endif
 
 /* Only print the "Muxing..." message once */
@@ -127,7 +162,7 @@ static int show_mux_warning = 1;
  ****************************************************************************/
 static void hb_cli_error_handler ( const char *errmsg )
 {
-    fprintf( stderr, "ERROR: %s", errmsg );
+    fprintf( stderr, "ERROR: %s\n", errmsg );
 }
 
 int main( int argc, char ** argv )
@@ -136,6 +171,14 @@ int main( int argc, char ** argv )
     int           build;
     char        * version;
 
+/* win32 _IOLBF (line-buffering) is the same as _IOFBF (full-buffering).
+ * force it to unbuffered otherwise informative output is not easily parsed.
+ */
+#if defined( _WIN32 ) || defined( __MINGW32__ )
+    setvbuf( stdout, NULL, _IONBF, 0 );
+    setvbuf( stderr, NULL, _IONBF, 0 );
+#endif
+
     audios = hb_list_init();
 
     /* Parse command line */
@@ -150,10 +193,11 @@ int main( int argc, char ** argv )
 
     /* Init libhb */
     h = hb_init( debug, update );
+    hb_dvd_set_dvdnav( dvdnav );
 
     /* Show version */
-    fprintf( stderr, "HandBrake %s (%d) - http://handbrake.fr/\n",
-             hb_get_version( h ), hb_get_build( h ) );
+    fprintf( stderr, "%s - %s - %s\n",
+             HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
 
     /* Check for update */
     if( update )
@@ -170,6 +214,7 @@ int main( int argc, char ** argv )
                      "date.\n" );
         }
         hb_close( &h );
+        hb_global_close();
         return 0;
     }
 
@@ -195,12 +240,35 @@ int main( int argc, char ** argv )
          */
         titleindex = 0;
     }
-    hb_scan( h, input, titleindex );
+
+    hb_scan( h, input, titleindex, preview_count, store_previews );
 
     /* Wait... */
     while( !die )
     {
-#if !defined(SYS_BEOS)
+#if defined( __MINGW32__ )
+        if( _kbhit() ) {
+            switch( _getch() )
+            {
+                case 0x03: /* ctrl-c */
+                case 'q':
+                    fprintf( stdout, "\nEncoding Quit by user command\n" );
+                    die = 1;
+                    break;
+                case 'p':
+                    fprintf( stdout, "\nEncoding Paused by user command, 'r' to resume\n" );
+                    hb_pause( h );
+                    break;
+                case 'r':
+                    hb_resume( h );
+                    break;
+                case 'h':
+                    ShowCommands();
+                    break;
+            }
+        }
+        hb_snooze( 200 );
+#elif !defined(SYS_BEOS)
         fd_set         fds;
         struct timeval tv;
         int            ret;
@@ -258,6 +326,7 @@ int main( int argc, char ** argv )
 
     /* Clean up */
     hb_close( &h );
+    hb_global_close();
     if( input )  free( input );
     if( output ) free( output );
     if( format ) free( format );
@@ -266,6 +335,10 @@ int main( int argc, char ** argv )
         while( ( audio = hb_list_item( audios, 0 ) ) )
         {
             hb_list_rem( audios, audio );
+            if( audio->out.name )
+            {
+                free( audio->out.name );
+            }
             free( audio );
         }
         hb_list_close( &audios );
@@ -276,10 +349,13 @@ int main( int argc, char ** argv )
     if( arates ) free( arates );
     if( abitrates ) free( abitrates );
     if( acodecs ) free( acodecs );
+    if( anames ) free( anames );
     if (native_language ) free (native_language );
        if( x264opts ) free (x264opts );
        if( x264opts2 ) free (x264opts2 );
     if (preset_name) free (preset_name);
+    if( stop_at_string ) free( stop_at_string );
+    if( start_at_string ) free( start_at_string );
 
     fprintf( stderr, "HandBrake has exited.\n" );
 
@@ -298,19 +374,29 @@ static void ShowCommands()
 static void PrintTitleInfo( hb_title_t * title )
 {
     hb_chapter_t  * chapter;
-    hb_audio_config_t    * audio;
     hb_subtitle_t * subtitle;
     int i;
 
     fprintf( stderr, "+ title %d:\n", title->index );
-    fprintf( stderr, "  + vts %d, ttn %d, cells %d->%d (%d blocks)\n",
-             title->vts, title->ttn, title->cell_start, title->cell_end,
-             title->block_count );
+    if ( title->type == HB_STREAM_TYPE )
+    {
+        fprintf( stderr, "  + stream: %s\n", title->path );
+    }
+    else if ( title->type == HB_DVD_TYPE )
+    {
+        fprintf( stderr, "  + vts %d, ttn %d, cells %d->%d (%d blocks)\n",
+                title->vts, title->ttn, title->cell_start, title->cell_end,
+                title->block_count );
+    }
+    if (dvdnav)
+        fprintf( stderr, "  + angle(s) %d\n", title->angle_count );
     fprintf( stderr, "  + duration: %02d:%02d:%02d\n",
              title->hours, title->minutes, title->seconds );
-    fprintf( stderr, "  + size: %dx%d, aspect: %.2f, %.3f fps\n",
+    fprintf( stderr, "  + size: %dx%d, pixel aspect: %d/%d, display aspect: %.2f, %.3f fps\n",
              title->width, title->height,
-             (float) title->aspect / HB_ASPECT_BASE,
+             title->pixel_aspect_width,
+             title->pixel_aspect_height,
+             (float) title->aspect,
              (float) title->rate / title->rate_base );
     fprintf( stderr, "  + autocrop: %d/%d/%d/%d\n", title->crop[0],
              title->crop[1], title->crop[2], title->crop[3] );
@@ -330,20 +416,29 @@ static void PrintTitleInfo( hb_title_t * title )
         audio = hb_list_audio_config_item( title->list_audio, i );
         if( ( audio->in.codec == HB_ACODEC_AC3 ) || ( audio->in.codec == HB_ACODEC_DCA) )
         {
-            fprintf( stderr, "    + %d, %s, %dHz, %dbps\n", i + 1,
-                     audio->lang.description, audio->in.samplerate, audio->in.bitrate );
+            fprintf( stderr, "    + %d, %s (iso639-2: %s), %dHz, %dbps\n", 
+                     i + 1,
+                     audio->lang.description, 
+                     audio->lang.iso639_2,
+                     audio->in.samplerate, 
+                     audio->in.bitrate );
         }
         else
         {
-            fprintf( stderr, "    + %d, %s\n", i + 1, audio->lang.description );
+            fprintf( stderr, "    + %d, %s (iso639-2: %s)\n", 
+                     i + 1, 
+                     audio->lang.description,
+                     audio->lang.iso639_2 );
         }
     }
     fprintf( stderr, "  + subtitle tracks:\n" );
     for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
     {
         subtitle = hb_list_item( title->list_subtitle, i );
-        fprintf( stderr, "    + %d, %s (iso639-2: %s)\n", i + 1, subtitle->lang,
-            subtitle->iso639_2);
+        fprintf( stderr, "    + %d, %s (iso639-2: %s) (%s)\n", 
+                 i + 1, subtitle->lang,
+                 subtitle->iso639_2,
+                 (subtitle->format == TEXTSUB) ? "Text" : "Bitmap");
     }
 
     if(title->detected_interlacing)
@@ -354,9 +449,29 @@ static void PrintTitleInfo( hb_title_t * title )
 
 }
 
+static int test_sub_list( char ** list, char * needle, int pos )
+{
+    int i;
+
+    if ( list == NULL || needle == NULL )
+        return 0;
+
+    if ( list[0] == NULL && pos == 1 )
+        return 1;
+
+    for ( i = 0; list[i] != NULL; i++ )
+    {
+        if ( strcasecmp( list[i], needle ) == 0 )
+            return i + 1;
+    }
+    return 0;
+}
+
 static int HandleEvents( hb_handle_t * h )
 {
     hb_state_t s;
+    int tmp_num_audio_tracks;
+
     hb_get_state( h, &s );
     switch( s.state )
     {
@@ -368,7 +483,7 @@ static int HandleEvents( hb_handle_t * h )
         case HB_STATE_SCANNING:
             /* Show what title is currently being scanned */
             fprintf( stderr, "Scanning title %d", p.title_cur );
-            if( !titleindex )
+            if( !titleindex || titlescan )
                 fprintf( stderr, " of %d", p.title_count );
             fprintf( stderr, "...\n" );
             break;
@@ -380,6 +495,7 @@ static int HandleEvents( hb_handle_t * h )
             hb_title_t * title;
             hb_job_t   * job;
             int i;
+            int sub_burned = 0;
 
             /* Audio argument string parsing variables */
             int acodec = 0;
@@ -398,8 +514,8 @@ static int HandleEvents( hb_handle_t * h )
                 die = 1;
                 break;
             }
-           if( longest_title )
-           {
+               if( longest_title )
+               {
                 int i;
                 int longest_title_idx=0;
                 int longest_title_pos=-1;
@@ -436,7 +552,7 @@ static int HandleEvents( hb_handle_t * h )
                 title = hb_list_item( list, 0 );
             }
 
-            if( !titleindex )
+            if( !titleindex || titlescan )
             {
                 /* Scan-only mode, print infos and exit */
                 int i;
@@ -454,7 +570,7 @@ static int HandleEvents( hb_handle_t * h )
 
             PrintTitleInfo( title );
 
-            if( chapter_start && chapter_end )
+            if( chapter_start && chapter_end && !stop_at_pts && !start_at_preview && !stop_at_frame && !start_at_pts && !start_at_frame )
             {
                 job->chapter_start = MAX( job->chapter_start,
                                           chapter_start );
@@ -464,247 +580,415 @@ static int HandleEvents( hb_handle_t * h )
                                           job->chapter_end );
             }
 
+            if ( angle )
+            {
+                job->angle = angle;
+            }
+
             if (preset)
             {
                 fprintf( stderr, "+ Using preset: %s", preset_name);
 
-                if (!strcmp(preset_name, "Animation"))
+                if (!strcmp(preset_name, "Universal"))
                 {
-                    mux = HB_MUX_MKV;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2");
-                    deinterlace = 1;
-                    deinterlace_opt = "0";
-                    job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "AppleTV"))
-                {
-                    if (!acodecs)
+                    job->vquality = 20.0;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1,1");
+                    }
+                    if( !acodecs )
                     {
                         acodecs = strdup("faac,ac3");
                     }
-
-                    mux = HB_MUX_MP4;
-                    job->largeFileSize = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2500;
-                    default_abitrate = 160;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0");
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160,160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2,auto");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48,Auto");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0,0.0");
+                    }
+                    maxWidth = 720;
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6");
+                    }
+                    anamorphic_mode = 2;
                     job->chapter_markers = 1;
-                    pixelratio = 1;
                 }
 
-                if (!strcmp(preset_name, "Bedlam"))
+                if (!strcmp(preset_name, "iPod"))
                 {
-                    mux = HB_MUX_MKV;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1800;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1");
-                    job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "Blind"))
-                {
-                    mux = HB_MUX_MP4;
-                    job->vbitrate = 512;
-                    default_abitrate = 128;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 512;
+                    job->vbitrate = 700;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0");
+                    }
+                    maxWidth = 320;
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0");
+                    }
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "Broke"))
+                if (!strcmp(preset_name, "iPhone & iPod Touch"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    size = 695;
-                    default_abitrate = 128;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 640;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip");
+                    job->vquality = 20.0;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("128");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0");
+                    }
+                    maxWidth = 480;
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0");
+                    }
                     job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "Classic"))
-                {
-                    mux = HB_MUX_MP4;
-                    job->vbitrate = 1000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                }
-
-                if (!strcmp(preset_name, "Constant Quality Rate"))
+                if (!strcmp(preset_name, "AppleTV"))
                 {
-                    mux = HB_MUX_MKV;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 0.64709997177124023;
-                    job->crf = 1;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh");
+                    job->vquality = 20.0;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1,1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac,ac3");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160,160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2,auto");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48,Auto");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0,0.0");
+                    }
+                    maxWidth = 960;
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500");
+                    }
+                    anamorphic_mode = 2;
                     job->chapter_markers = 1;
-                    pixelratio = 1;
                 }
 
-                if (!strcmp(preset_name, "Deux Six Quatre"))
+                if (!strcmp(preset_name, "Normal"))
                 {
-                    mux = HB_MUX_MKV;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1600;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip");
+                    job->vquality = 20.0;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0");
+                    }
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0");
+                    }
+                    anamorphic_mode = 1;
                     job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "Film"))
+                if (!strcmp(preset_name, "High Profile"))
                 {
-                    mux = HB_MUX_MKV;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1800;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip");
+                    job->vquality = 20.0;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1,1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac,ac3");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160,160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2,auto");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48,Auto");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0,0.0");
+                    }
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("b-adapt=2:rc-lookahead=50");
+                    }
+                    detelecine = 1;
+                    decomb = 1;
+                    anamorphic_mode = 2;
                     job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "iPhone / iPod Touch"))
+                if (!strcmp(preset_name, "Classic"))
                 {
-                    mux = HB_MUX_MP4;
-                    job->ipod_atom = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 960;
-                    default_abitrate = 128;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 480;
-                    x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1");
-                    job->chapter_markers = 1;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->vbitrate = 1000;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0");
+                    }
                 }
 
-                if (!strcmp(preset_name, "iPod High-Rez"))
+                if (!strcmp(preset_name, "AppleTV Legacy"))
                 {
-                    mux = HB_MUX_MP4;
-                    job->ipod_atom = 1;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1500;
-                    default_abitrate = 160;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 640;
-                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
+                    job->vbitrate = 2500;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1,1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac,ac3");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160,160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2,auto");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48,Auto");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0,0.0");
+                    }
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0");
+                    }
+                    anamorphic_mode = 1;
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "iPod Low-Rez"))
+                if (!strcmp(preset_name, "iPhone Legacy"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 700;
-                    default_abitrate = 160;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 320;
-                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
+                    job->vbitrate = 960;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("128");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0");
+                    }
+                    maxWidth = 480;
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0");
+                    }
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "Normal"))
+                if (!strcmp(preset_name, "iPod Legacy"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vbitrate = 1500;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=2:bframes=2:subme=5:me=umh");
-                    job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "PS3"))
-                {
-                    mux = HB_MUX_MP4;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2500;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("level=41:subme=5:me=umh");
-                    pixelratio = 1;
-                }
-
-                if (!strcmp(preset_name, "PSP"))
-                {
-                    mux = HB_MUX_MP4;
-                    job->vbitrate = 1024;
-                    default_abitrate = 128;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 368;
-                    job->height = 208;
-                    job->chapter_markers = 1;
-                }
-
-                if (!strcmp(preset_name, "QuickTime"))
-                {
-                    mux = HB_MUX_MP4;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip");
-                    job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "Television"))
-                {
-                    mux = HB_MUX_MKV;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1300;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip");
-                    deinterlace = 1;
-                    deinterlace_opt = "0";
-                    denoise = 1;
-                    denoise_opt = "2:1:2:3";
+                    if( !atracks )
+                    {
+                        atracks = strdup("1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = strdup("160");
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("48");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0");
+                    }
+                    maxWidth = 640;
+                    if( !x264opts )
+                    {
+                        x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0");
+                    }
                     job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "Xbox 360"))
-                {
-                    mux = HB_MUX_MP4;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1");
-                    pixelratio = 1;
                 }
             }
 
@@ -783,33 +1067,15 @@ static int HandleEvents( hb_handle_t * h )
 
             job->deinterlace = deinterlace;
             job->grayscale   = grayscale;
-            if (loosePixelratio)
-            {
-                job->pixel_ratio = 2;
-                if (modulus)
-                {
-                    job->modulus = modulus;
-                }
-                if( par_width && par_height )
-                {
-                    job->pixel_ratio = 3;
-                    job->pixel_aspect_width = par_width;
-                    job->pixel_aspect_height = par_height;
-                }
-            }
-            else
-            {
-                job->pixel_ratio = pixelratio;
-            }
-
-            if (vfr)
-            {
-                detelecine = 1;
-                job->vfr = 1;
-            }
-
+            
             /* Add selected filters */
             job->filters = hb_list_init();
+            
+            if( rotate )
+            {
+                hb_filter_rotate.settings = rotate_opt;
+                hb_list_add( job->filters, &hb_filter_rotate);
+            }
             if( detelecine )
             {
                 hb_filter_detelecine.settings = detelecine_opt;
@@ -836,31 +1102,151 @@ static int HandleEvents( hb_handle_t * h )
                 hb_list_add( job->filters, &hb_filter_denoise );
             }
 
-            if( width && height )
-            {
-                job->width  = width;
-                job->height = height;
-            }
-            else if( width )
-            {
-                job->width = width;
-                hb_fix_aspect( job, HB_KEEP_WIDTH );
-            }
-            else if( height && !loosePixelratio)
-            {
-                job->height = height;
-                hb_fix_aspect( job, HB_KEEP_HEIGHT );
-            }
-            else if( !width && !height && !pixelratio && !loosePixelratio )
+            switch( anamorphic_mode )
             {
-                hb_fix_aspect( job, HB_KEEP_WIDTH );
-            }
-            else if (!width && loosePixelratio)
-            {
-                /* Default to full width when one isn't specified for loose anamorphic */
-                job->width = title->width - job->crop[2] - job->crop[3];
-                /* The height will be thrown away in hb.c but calculate it anyway */
-                hb_fix_aspect( job, HB_KEEP_WIDTH );
+                case 0: // Non-anamorphic
+                    
+                    if( width && height )
+                    {
+                        job->width  = width;
+                        job->height = height;
+                    }
+                    else if( width )
+                    {
+                        job->width = width;
+                        hb_fix_aspect( job, HB_KEEP_WIDTH );
+                    }
+                    else if( height )
+                    {
+                        job->height = height;
+                        hb_fix_aspect( job, HB_KEEP_HEIGHT );
+                    }
+                    else if( !width && !height )
+                    {
+                        hb_fix_aspect( job, HB_KEEP_WIDTH );
+                    }
+
+                break;
+                
+                case 1: // Strict anammorphic
+                    job->anamorphic.mode = anamorphic_mode;
+                break;
+                
+                case 2: // Loose anamorphic
+                    job->anamorphic.mode = 2;
+                    
+                    if (modulus)
+                    {
+                        job->modulus = modulus;
+                    }
+                    
+                    if( itu_par )
+                    {
+                        job->anamorphic.itu_par = itu_par;
+                    }
+                    
+                    if( width )
+                    {
+                        job->width = width;
+                    }
+                    else if( !width && !height )
+                    {
+                        /* Default to full width when one isn't specified for loose anamorphic */
+                        job->width = title->width - job->crop[2] - job->crop[3];
+                    }
+                    
+                break;
+                
+                case 3: // Custom Anamorphic 3: Power User Jamboree 
+                    job->anamorphic.mode = 3;
+                    
+                    if (modulus)
+                    {
+                        job->modulus = modulus;
+                    }
+                    
+                    if( itu_par )
+                    {
+                        job->anamorphic.itu_par = itu_par;
+                    }
+                    
+                    if( par_width && par_height )
+                    {
+                        job->anamorphic.par_width = par_width;
+                        job->anamorphic.par_height = par_height;
+                    }
+                    
+                    if( keep_display_aspect )
+                    {
+                        job->anamorphic.keep_display_aspect = 1;
+                        
+                        /* First, what *is* the display aspect? */
+                        int cropped_width = title->width - job->crop[2] - job->crop[3];
+                        int cropped_height = title->height - job->crop[0] - job->crop[1];
+                        
+                        /* XXX -- I'm assuming people want to keep the source
+                           display AR even though they might have already
+                           asked for ITU values instead. */
+                        float source_display_width = (float)cropped_width *
+                            (float)title->pixel_aspect_width / (float)title->pixel_aspect_height;
+                        float display_aspect = source_display_width / (float)cropped_height;
+                        /* When keeping display aspect, we have to rank some values
+                           by priority in order to consistently handle situations
+                           when more than one might be specified by default.
+                           
+                           * First off, PAR gets ignored. (err make this reality)
+                           * Height will be respected over all other settings,
+                           * If it isn't set, display_width will be followed.
+                           * If it isn't set, width will be followed.          */
+                        if( height )
+                        {
+                            /* We scale the display width to the new height */
+                            display_width = (int)( (double)height * display_aspect );
+                        }
+                        else if( display_width )
+                        {
+                            /* We scale the height to the new display width */
+                            height = (int)( (double)display_width / display_aspect );
+                        }
+                    }
+                    
+                    if( display_width )
+                    {
+                        /* Adjust the PAR to create the new display width
+                           from the default job width. */
+                        job->anamorphic.dar_width = display_width;
+                        
+                        job->anamorphic.dar_height = height ?
+                                                        height :
+                                                        title->height - job->crop[0] - job->crop[1];
+                    }
+                    
+                    if( width && height )
+                    {
+                        /* Use these storage dimensions */
+                        job->width  = width;
+                        job->height = height;
+                    }
+                    else if( width )
+                    {
+                        /* Use just this storage width */
+                        job->width = width;
+                        job->height = title->height - job->crop[0] - job->crop[1];
+                    }
+                    else if( height )
+                    {
+                        /* Use just this storage height. */
+                        job->height = height;
+                        job->width = title->width - job->crop[2] - job->crop[3];
+                    }
+                    else if( !width && !height )
+                    {
+                        /* Assume source dimensions after cropping. */
+                        job->width = title->width - job->crop[2] - job->crop[3];
+                        job->height = title->height - job->crop[0] - job->crop[1];
+                    }
+                    
+                break;
             }
 
             if( vquality >= 0.0 && ( ( vquality <= 1.0 ) || ( vcodec == HB_VCODEC_X264 ) || (vcodec == HB_VCODEC_FFMPEG) ) )
@@ -887,10 +1273,18 @@ static int HandleEvents( hb_handle_t * h )
             }
             if( vrate )
             {
-                job->cfr = 1;
+                job->cfr = cfr;
                 job->vrate = 27000000;
                 job->vrate_base = vrate;
             }
+            else if ( cfr )
+            {
+                // cfr or pfr flag with no rate specified implies
+                // use the title rate.
+                job->cfr = cfr;
+                job->vrate = title->rate;
+                job->vrate_base = title->rate_base;
+            }
 
             /* Grab audio tracks */
             if( atracks )
@@ -945,8 +1339,59 @@ static int HandleEvents( hb_handle_t * h )
             }
 
             /* Parse audio tracks */
-            if( hb_list_count(audios) == 0 )
+            if( native_language && native_dub )
             {
+                if( hb_list_count( audios ) == 0 || !audio_explicit )
+                {
+                    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+                    {
+                        char audio_lang[4];
+                        int track = i;
+                        
+                        audio = hb_list_audio_config_item( title->list_audio, i );
+                        
+                        strncpy( audio_lang, audio->lang.iso639_2, sizeof( audio_lang ) );
+                        
+                        if( strncasecmp( native_language, audio_lang, 
+                                         sizeof( audio_lang ) ) == 0 &&
+                            audio->lang.type != 3 && // Directors 1
+                            audio->lang.type != 4)   // Directors 2
+                        {
+                            /*
+                             * Matched an audio to our native language - use it.
+                             * Replace any existing audio tracks that a preset may
+                             * have put here.
+                             */
+                            if( hb_list_count(audios) == 0) {
+                                audio = calloc(1, sizeof(*audio));
+                                hb_audio_config_init(audio);
+                                audio->in.track = track;
+                                audio->out.track = num_audio_tracks++;
+                                /* Add it to our audios */
+                                hb_list_add(audios, audio);
+                            } else {
+                                /*
+                                 * Update the track numbers on what is already in
+                                 * there.
+                                 */
+                                for( i=0; i < hb_list_count( audios ); i++ )
+                                {
+                                    audio = hb_list_item( audios, i );
+
+                                    audio->in.track = track;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                } else {
+                    fprintf( stderr, "Warning: Native language (dubbing) selection ignored since an audio track has already been selected\n");
+                }
+            }
+
+            if( hb_list_count(audios) == 0 &&
+                hb_list_count(job->title->list_audio) > 0 )
+            {        
                 /* Create a new audio track with default settings */
                 audio = calloc(1, sizeof(*audio));
                 hb_audio_config_init(audio);
@@ -954,8 +1399,8 @@ static int HandleEvents( hb_handle_t * h )
                 hb_list_add(audios, audio);
             }
 
-            num_audio_tracks = hb_list_count(audios);
-            for (i = 0; i < num_audio_tracks; i++)
+            tmp_num_audio_tracks = num_audio_tracks = hb_list_count(audios);
+            for (i = 0; i < tmp_num_audio_tracks; i++)
             {
                 audio = hb_list_item(audios, 0);
                 if( (audio == NULL) || (audio->in.track == -1) ||
@@ -965,13 +1410,22 @@ static int HandleEvents( hb_handle_t * h )
                 }
                 else
                 {
-                    hb_audio_add( job, audio );
+                    if( hb_audio_add( job, audio ) == 0 )
+                    {
+                        fprintf(stderr, "ERROR: Invalid audio input track '%u', exiting.\n", 
+                                audio->in.track + 1 );
+                        num_audio_tracks--;
+                        exit(3);
+                    }
                 }
                 hb_list_rem(audios, audio);
                 if( audio != NULL)
+                    if( audio->out.name )
+                    {
+                        free( audio->out.name);
+                    }
                     free( audio );
             }
-            /* Audio Tracks */
 
             /* Audio Codecs */
             i = 0;
@@ -997,13 +1451,20 @@ static int HandleEvents( hb_handle_t * h )
                         hb_audio_config_t * last_audio = hb_list_audio_config_item( job->list_audio, i - 1 );
                         hb_audio_config_t audio;
 
-                        fprintf(stderr, "More audio codecs than audio tracks, copying track %i and using encoder %s\n",
-                            i, token);
-                        hb_audio_config_init(&audio);
-                        audio.in.track = last_audio->in.track;
-                        audio.out.track = num_audio_tracks++;
-                        audio.out.codec = acodec;
-                        hb_audio_add(job, &audio);
+                        if( last_audio )
+                        {
+                            fprintf(stderr, "More audio codecs than audio tracks, copying track %i and using encoder %s\n",
+                                    i, token);
+                            hb_audio_config_init(&audio);
+                            audio.in.track = last_audio->in.track;
+                            audio.out.track = num_audio_tracks++;
+                            audio.out.codec = acodec;
+                            hb_audio_add(job, &audio);
+                        }
+                        else
+                        {
+                            fprintf(stderr, "Audio codecs and no valid audio tracks, skipping codec %s\n", token);
+                        }
                     }
                     token = strtok(NULL, ",");
                     i++;
@@ -1047,15 +1508,22 @@ static int HandleEvents( hb_handle_t * h )
                         }
                     }
 
-                    if (!is_sample_rate_valid(arate))
+                    if( audio != NULL )
+                    {
+                        if (!is_sample_rate_valid(arate))
+                        {
+                            fprintf(stderr, "Invalid sample rate %d, using input rate %d\n", arate, audio->in.samplerate);
+                            arate = audio->in.samplerate;
+                        }
+                        
+                        audio->out.samplerate = arate;
+                        if( (++i) >= num_audio_tracks )
+                            break;  /* We have more inputs than audio tracks, oops */
+                    }
+                    else 
                     {
-                        fprintf(stderr, "Invalid sample rate %d, using input rate %d\n", arate, audio->in.samplerate);
-                        arate = audio->in.samplerate;
+                        fprintf(stderr, "Ignoring sample rate %d, no audio tracks\n", arate);
                     }
-
-                    audio->out.samplerate = arate;
-                    if( (++i) >= num_audio_tracks )
-                        break;  /* We have more inputs than audio tracks, oops */
                     token = strtok(NULL, ",");
                 }
             }
@@ -1085,9 +1553,17 @@ static int HandleEvents( hb_handle_t * h )
                 {
                     abitrate = atoi(token);
                     audio = hb_list_audio_config_item(job->list_audio, i);
-                    audio->out.bitrate = abitrate;
-                    if( (++i) >= num_audio_tracks )
-                        break;  /* We have more inputs than audio tracks, oops */
+
+                    if( audio != NULL )
+                    {
+                        audio->out.bitrate = abitrate;
+                        if( (++i) >= num_audio_tracks )
+                            break;  /* We have more inputs than audio tracks, oops */
+                    }
+                    else 
+                    {
+                        fprintf(stderr, "Ignoring bitrate %d, no audio tracks\n", abitrate);
+                    }
                     token = strtok(NULL, ",");
                 }
             }
@@ -1118,9 +1594,16 @@ static int HandleEvents( hb_handle_t * h )
                 {
                     d_r_c = atof(token);
                     audio = hb_list_audio_config_item(job->list_audio, i);
-                    audio->out.dynamic_range_compression = d_r_c;
-                    if( (++i) >= num_audio_tracks )
-                        break;  /* We have more inputs than audio tracks, oops */
+                    if( audio != NULL )
+                    {
+                        audio->out.dynamic_range_compression = d_r_c;
+                        if( (++i) >= num_audio_tracks )
+                            break;  /* We have more inputs than audio tracks, oops */
+                    } 
+                    else
+                    {
+                        fprintf(stderr, "Ignoring drc, no audio tracks\n");
+                    }
                     token = strtok(NULL, ",");
                 }
             }
@@ -1138,55 +1621,307 @@ static int HandleEvents( hb_handle_t * h )
                     audio->out.dynamic_range_compression = d_r_c;
                 }
             }
-            /* Audio DRC */
+            /* Audio DRC */
+
+            /* Audio Mixdown */
+            i = 0;
+            if ( mixdowns )
+            {
+                char * token = strtok(mixdowns, ",");
+                if (token == NULL)
+                    token = mixdowns;
+                while ( token != NULL )
+                {
+                    mixdown = hb_mixdown_get_mixdown_from_short_name(token);
+                    audio = hb_list_audio_config_item(job->list_audio, i);
+                    if( audio != NULL )
+                    {
+                        audio->out.mixdown = mixdown;
+                        if( (++i) >= num_audio_tracks )
+                            break;  /* We have more inputs than audio tracks, oops */
+                    }
+                    else
+                    {
+                        fprintf(stderr, "Ignoring mixdown, no audio tracks\n");
+                    }
+                    token = strtok(NULL, ",");
+                }
+            }
+            if (i < num_audio_tracks)
+            {
+                /* We have fewer inputs than audio tracks, use DPLII for the rest. Unless
+                 * we only have one input, then use that.
+                 */
+                if (i != 1)
+                    mixdown = HB_AMIXDOWN_DOLBYPLII;
+                for (; i < num_audio_tracks; i++)
+                {
+                   audio = hb_list_audio_config_item(job->list_audio, i);
+                   audio->out.mixdown = mixdown;
+                }
+            }
+            /* Audio Mixdown */
+
+            /* Audio Track Names */
+            i = 0;
+            if ( anames )
+            {
+                char * token = strtok(anames, ",");
+                if (token == NULL)
+                    token = anames;
+                while ( token != NULL )
+                {
+                    audio = hb_list_audio_config_item(job->list_audio, i);
+                    if( audio != NULL )
+                    {
+                        audio->out.name = strdup(token);
+                        if( (++i) >= num_audio_tracks )
+                            break;  /* We have more names than audio tracks, oops */
+                    }
+                    else
+                    {
+                        fprintf(stderr, "Ignoring aname '%s', no audio track\n",
+                                token);
+                    }
+                    token = strtok(NULL, ",");
+                }
+            }
+            if( i < num_audio_tracks && i == 1 )
+            {
+                /* We have exactly one name and more than one audio track. Use the same
+                 * name for all tracks. */
+                for ( ; i < num_audio_tracks; i++)
+                {
+                    audio = hb_list_audio_config_item(job->list_audio, i);
+                    audio->out.name = strdup(anames);
+                }
+            }
+            /* Audio Track Names */
+
+            if( size )
+            {
+                job->vbitrate = hb_calc_bitrate( job, size );
+                fprintf( stderr, "Calculated bitrate: %d kbps\n",
+                         job->vbitrate );
+            }
+
+            if( subtracks )
+            {
+                char * token;
+                int    i, pos;
+
+                pos = 0;
+                for ( i = 0; subtracks[i] != NULL; i++ )
+                {
+                    pos++;
+                    token = subtracks[i];
+                    if( strcasecmp(token, "scan" ) == 0 )
+                    {
+                        int burn = 0, force = 0, def = 0;
+
+                        if ( subburn != NULL )
+                        {
+                            burn = ( pos == 1 && subburn[0] == 0 ) ||
+                                   ( strcmp( "scan", subburn ) == 0 );
+                        }
+                        if ( subdefault != NULL )
+                        {
+                            def =  ( pos == 1 && subdefault[0] == 0 ) ||
+                                   ( strcmp( "scan", subdefault ) == 0 );
+                        }
+                        force = test_sub_list( subforce, "scan", pos );
+
+                        if ( !burn && mux == HB_MUX_MKV )
+                        {
+                            job->select_subtitle_config.dest = PASSTHRUSUB;
+                        }
+                        else if ( burn )
+                        {
+                            if ( sub_burned )
+                            {
+                                continue;
+                            }
+                            sub_burned = 1;
+                        }
+                        if ( !( !burn && mux == HB_MUX_MP4 ) )
+                        {
+                            job->select_subtitle_config.force = force;
+                            job->select_subtitle_config.default_track = def;
+                            subtitle_scan = 1;
+                        } else {
+                            fprintf( stderr, "Warning: Subtitle Scan for MP4 requires the '--subtitle-burn' option to be selected\n");
+                        }
+                    }
+                    else
+                    {
+                        hb_subtitle_t        * subtitle;
+                        hb_subtitle_config_t   sub_config;
+                        int                    track;
+                        int                    burn = 0, force = 0, def = 0;
+
+                        track = atoi(token) - 1;
+                        subtitle = hb_list_item(title->list_subtitle, track);
+                        if( subtitle == NULL ) 
+                        {
+                            fprintf( stderr, "Warning: Could not find subtitle track %d, skipped\n", track+1 );
+                            continue;
+                        }
+                        sub_config = subtitle->config;
+
+                        if ( subburn != NULL )
+                        {
+                            burn = ( pos == 1 && subburn[0] == 0 ) ||
+                                   ( strcmp( token, subburn ) == 0 );
+                        }
+                        if ( subdefault != NULL )
+                        {
+                            def =  ( pos == 1 && subdefault[0] == 0 ) ||
+                                   ( strcmp( token, subdefault ) == 0 );
+                        }
+
+                        force = test_sub_list(subforce, token, pos);
+
+                        if ( !burn && mux == HB_MUX_MKV && 
+                             subtitle->format == PICTURESUB)
+                        {
+                            sub_config.dest = PASSTHRUSUB;
+                        }
+                        else if (!burn && mux == HB_MUX_MP4 &&
+                             subtitle->format == PICTURESUB)
+                        {
+                            // Skip any non-burned vobsubs when output is mp4
+                            fprintf( stderr, "Warning: Skipping subtitle track %d, can't pass-through VOBSUBs in an MP4 container,\nadd '--subtitle-burn %d' to the command line\n", track+1, track+1 );
+                            continue;
+                        }
+                        else if ( burn && subtitle->format == PICTURESUB )
+                        {
+                            // Only allow one subtitle to be burned into video
+                            if ( sub_burned )
+                            {
+                                fprintf( stderr, "Warning: Skipping subtitle track %d, can't have more than one track burnt in\n", track+1 );
+                                continue;
+                            }
+                            sub_burned = 1;
+                        }
+                        sub_config.force = force;
+                        sub_config.default_track = def;
+                        hb_subtitle_add( job, &sub_config, track );
+                    }
+                }
+            }
 
-            /* Audio Mixdown */
-            i = 0;
-            if ( mixdowns )
-            {
-                char * token = strtok(mixdowns, ",");
-                if (token == NULL)
-                    token = mixdowns;
-                while ( token != NULL )
-                {
-                    mixdown = hb_mixdown_get_mixdown_from_short_name(token);
-                    audio = hb_list_audio_config_item(job->list_audio, i);
-                    audio->out.mixdown = mixdown;
-                    if( (++i) >= num_audio_tracks )
-                        break;  /* We have more inputs than audio tracks, oops */
-                    token = strtok(NULL, ",");
-                }
-            }
-            if (i < num_audio_tracks)
+            if( srtfile )
             {
-                /* We have fewer inputs than audio tracks, use DPLII for the rest. Unless
-                 * we only have one input, then use that.
-                 */
-                if (i != 1)
-                    mixdown = HB_AMIXDOWN_DOLBYPLII;
-                for (; i < num_audio_tracks; i++)
+                char * token;
+                int i, pos;
+                hb_subtitle_config_t sub_config;
+
+                pos = 0;
+                for( i=0; srtfile[i] != NULL; i++ )
                 {
-                   audio = hb_list_audio_config_item(job->list_audio, i);
-                   audio->out.mixdown = mixdown;
-                }
-            }
-            /* Audio Mixdown */
+                    char *codeset = "L1";
+                    int64_t offset = 0;
+                    char *lang = "und";
 
-            if( size )
-            {
-                job->vbitrate = hb_calc_bitrate( job, size );
-                fprintf( stderr, "Calculated bitrate: %d kbps\n",
-                         job->vbitrate );
-            }
+                    pos++;
+                    token = srtfile[i];
+                    if( srtcodeset && srtcodeset[i] )
+                    {
+                        codeset = srtcodeset[i];
+                    }
+                    if( srtoffset && srtoffset[i] )
+                    {
+                        offset = strtoll( srtoffset[i], &srtoffset[i], 0 );
+                    }
+                    if ( srtlang && srtlang[i] )
+                    {
+                        lang = srtlang[i];
+                    }
+                    sub_config.default_track = 
+                           ( srtdefault != -1 ) && ( srtdefault == i + 1 );
+                    sub_config.force = 0;
+                    strncpy( sub_config.src_filename, srtfile[i], 128);
+                    strncpy( sub_config.src_codeset, codeset, 40);
+                    sub_config.offset = offset;
 
-            if( sub )
-            {
-                job->subtitle = sub - 1;
+                    hb_srt_add( job, &sub_config, lang);
+                }
             }
 
             if( native_language )
             {
-                job->native_language = strdup( native_language );
+                char audio_lang[4];
+                
+                audio = hb_list_audio_config_item(job->list_audio, 0);
+                
+                if( audio ) 
+                {
+                    strncpy( audio_lang, audio->lang.iso639_2, sizeof( audio_lang ) );
+                    
+                    if( strncasecmp( native_language, audio_lang, 
+                                     sizeof( audio_lang ) ) != 0 )
+                    {
+                        /*
+                         * Audio language is not the same as our native language. 
+                         * If we have any subtitles in our native language they
+                         * should be selected here if they haven't already been.
+                         */
+                        hb_subtitle_t *subtitle, *subtitle2 = NULL;
+                        int matched_track = 0;
+
+                        for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
+                        {
+                            subtitle = hb_list_item( title->list_subtitle, i );
+                            matched_track = i;
+                            if( strcmp( subtitle->iso639_2, native_language ) == 0 )
+                            {  
+                                /*
+                                 * Found the first matching subtitle in our
+                                 * native language. Is it already selected?
+                                 */
+                                for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+                                {
+                                    subtitle2 =  hb_list_item( job->list_subtitle, i );
+                                    
+                                    if( subtitle2->track == subtitle->track) {
+                                        /*
+                                         * Already selected
+                                         */
+                                        break;
+                                    }
+                                    subtitle2 = NULL;
+                                }
+                                
+                                if( subtitle2 == NULL ) 
+                                {
+                                    /*
+                                     * Not already selected, so select it.
+                                     */
+                                    hb_subtitle_config_t sub_config;
+
+                                    if( native_dub )
+                                    {
+                                        fprintf( stderr, "Warning: no matching audio for native language - using subtitles instead.\n");
+                                    }
+                                    sub_config = subtitle->config;
+
+                                    if( mux == HB_MUX_MKV || subtitle->format == TEXTSUB)
+                                    {
+                                        sub_config.dest = PASSTHRUSUB;
+                                    }
+
+                                    sub_config.force = 0;
+                                    sub_config.default_track = 1;
+                                    hb_subtitle_add( job, &sub_config, matched_track);
+                                }
+                                /*
+                                 * Stop searching.
+                                 */
+                                break;
+                            }
+                        }
+                    }
+                }
             }
 
             if( job->mux )
@@ -1209,9 +1944,9 @@ static int HandleEvents( hb_handle_t * h )
 
             job->file = strdup( output );
 
-            if( crf )
+            if( color_matrix )
             {
-                job->crf = 1;
+                job->color_matrix = color_matrix;
             }
 
             if( x264opts != NULL && *x264opts != '\0' )
@@ -1227,11 +1962,36 @@ static int HandleEvents( hb_handle_t * h )
             if (maxHeight)
                 job->maxHeight = maxHeight;
 
-            if( subtitle_force )
+            if( start_at_preview )
             {
-                job->subtitle_force = subtitle_force;
+                job->start_at_preview = start_at_preview - 1;
+                job->seek_points = preview_count;
             }
-
+            
+            if( stop_at_pts )
+            {
+                job->pts_to_stop = stop_at_pts;
+                subtitle_scan = 0;
+            }
+            
+            if( stop_at_frame )
+            {
+                job->frame_to_stop = stop_at_frame;
+                subtitle_scan = 0;
+            }
+            
+            if( start_at_pts )
+            {
+                job->pts_to_start = start_at_pts;
+                subtitle_scan = 0;
+            }
+            
+            if( start_at_frame )
+            {
+                job->frame_to_start = start_at_frame;
+                subtitle_scan = 0;
+            }
+            
             if( subtitle_scan )
             {
                 char *x264opts_tmp;
@@ -1249,8 +2009,6 @@ static int HandleEvents( hb_handle_t * h )
                 job->indepth_scan = subtitle_scan;
                 fprintf( stderr, "Subtitle Scan Enabled - enabling "
                          "subtitles if found for foreign language segments\n");
-                job->select_subtitle = malloc(sizeof(hb_subtitle_t*));
-                *(job->select_subtitle) = NULL;
 
                 /*
                  * Add the pre-scan job
@@ -1267,10 +2025,6 @@ static int HandleEvents( hb_handle_t * h )
                  * for the first pass and then off again for the
                  * second.
                  */
-                hb_subtitle_t **subtitle_tmp = job->select_subtitle;
-
-                job->select_subtitle = NULL;
-
                 job->pass = 1;
 
                 job->indepth_scan = 0;
@@ -1312,8 +2066,6 @@ static int HandleEvents( hb_handle_t * h )
                 }
                 hb_add( h, job );
 
-                job->select_subtitle = subtitle_tmp;
-
                 job->pass = 2;
                 /*
                  * On the second pass we turn off subtitle scan so that we
@@ -1343,6 +2095,17 @@ static int HandleEvents( hb_handle_t * h )
         }
 
 #define p s.param.working
+        case HB_STATE_SEARCHING:
+            fprintf( stdout, "\rEncoding: task %d of %d, Searching for start time, %.2f %%",
+                     p.job_cur, p.job_count, 100.0 * p.progress );
+            if( p.seconds > -1 )
+            {
+                fprintf( stdout, " (ETA %02dh%02dm%02ds)", 
+                         p.hours, p.minutes, p.seconds );
+            }
+            fflush(stdout);
+            break;
+
         case HB_STATE_WORKING:
             fprintf( stdout, "\rEncoding: task %d of %d, %.2f %%",
                      p.job_cur, p.job_count, 100.0 * p.progress );
@@ -1417,147 +2180,246 @@ void SigHandler( int i_signal )
 static void ShowHelp()
 {
     int i;
+    FILE* const out = stdout;
 
-    fprintf( stderr,
+    fprintf( out,
     "Syntax: HandBrakeCLI [options] -i <device> -o <file>\n"
     "\n"
-       "### General Handbrake Options------------------------------------------------\n\n"
+    "### General Handbrake Options------------------------------------------------\n\n"
     "    -h, --help              Print help\n"
     "    -u, --update            Check for updates and exit\n"
-    "    -v, --verbose           Be verbose\n"
+    "    -v, --verbose <#>       Be verbose (optional argument: logging level)\n"
     "    -C, --cpu               Set CPU count (default: autodetected)\n"
     "    -Z. --preset <string>   Use a built-in preset. Capitalization matters, and\n"
     "                            if the preset name has spaces, surround it with\n"
     "                            double quotation marks\n"
     "    -z, --preset-list       See a list of available built-in presets\n"
+    "        --no-dvdnav         Do not use dvdnav for reading DVDs\n"
+    "                            (experimental, enabled by default for testing)\n"
     "\n"
 
-       "### Source Options-----------------------------------------------------------\n\n"
-       "    -i, --input <string>    Set input device\n"
-       "    -t, --title <number>    Select a title to encode (0 to scan only,\n"
+    "### Source Options-----------------------------------------------------------\n\n"
+    "    -i, --input <string>    Set input device\n"
+    "    -t, --title <number>    Select a title to encode (0 to scan all titles only,\n"
     "                            default: 1)\n"
+    "        --scan              Scan selected title only.\n"
     "    -L, --longest           Select the longest title\n"
     "    -c, --chapters <string> Select chapters (e.g. \"1-3\" for chapters\n"
     "                            1 to 3, or \"3\" for chapter 3 only,\n"
     "                            default: all chapters)\n"
-       "\n"
+    "        --angle <number>    Select the DVD angle\n"
+    "        --previews <#:B>    Select how many preview images are generated (max 30),\n"
+    "                            and whether or not they're stored to disk (0 or 1).\n"
+    "                            (default: 10:0)\n"
+    "    --start-at-preview <#>  Start encoding at a given preview.\n"
+    "    --start-at    <unit:#>  Start encoding at a given frame, duration (in seconds),\n"
+    "                            or pts (on a 90kHz clock)\n"
+    "    --stop-at     <unit:#>  Stop encoding at a given frame, duration (in seconds),\n"
+    "                            or pts (on a 90kHz clock)"
+    "\n"
 
-       "### Destination Options------------------------------------------------------\n\n"
+    "### Destination Options------------------------------------------------------\n\n"
     "    -o, --output <string>   Set output file name\n"
-       "    -f, --format <string>   Set output format (avi/mp4/ogm/mkv, default:\n"
+    "    -f, --format <string>   Set output format (mp4/mkv, default:\n"
     "                            autodetected from file name)\n"
+    "    -m, --markers           Add chapter markers (mp4 and mkv output formats only)\n"
     "    -4, --large-file        Use 64-bit mp4 files that can hold more than\n"
-    "                            4 GB. Note: Breaks iPod, @TV, PS3 compatibility.\n"""
+    "                            4 GB. Note: Breaks iPod, PS3 compatibility.\n"""
     "    -O, --optimize          Optimize mp4 files for HTTP streaming\n"
-    "    -I, --ipod-atom         Mark mp4 files so iPods will accept them\n"
+    "    -I, --ipod-atom         Mark mp4 files so 5.5G iPods will accept them\n"
     "\n"
 
-       "### Picture Settings---------------------------------------------------------\n\n"
-    "    -w, --width <number>    Set picture width\n"
-    "    -l, --height <number>   Set picture height\n"
-    "        --crop <T:B:L:R>    Set cropping values (default: autocrop)\n"
-       "    -Y, --maxHeight <#>     Set maximum height\n"
-       "    -X, --maxWidth <#>      Set maximum width\n"
-       "    -s, --subtitle <number> Select subtitle (default: none)\n"
-    "    -U, --subtitle-scan     Scan for subtitles in an extra 1st pass, and choose\n"
-    "                            the one that's only used 10 percent of the time\n"
-    "                            or less. This should locate subtitles for short\n"
-    "                            foreign language segments. Best used in conjunction\n"
-    "                            with --subtitle-forced.\n"
-    "    -F, --subtitle-forced   Only display subtitles from the selected stream if\n"
-    "                            the subtitle has the forced flag set. May be used in\n"
-    "                            conjunction with --subtitle-scan to auto-select\n"
-    "                            a stream if it contains forced subtitles.\n"
-    "    -N, --native-language   Select subtitles with this language if it does not\n"
-    "          <string>          match the Audio language. Provide the language's\n"
-    "                            iso639-2 code (fre, eng, spa, dut, et cetera)\n"
-       "    -m, --markers           Add chapter markers (mp4 output format only)\n"
-       "\n"
-
-       "### Video Options------------------------------------------------------------\n\n"
-       "    -e, --encoder <string>  Set video library encoder (ffmpeg,xvid,\n"
-    "                            x264,theora default: ffmpeg)\n"
-       "    -q, --quality <float>   Set video quality (0.0..1.0)\n"
-       "    -Q, --cqp               Use with -q for CQP instead of CRF\n"
+
+    "### Video Options------------------------------------------------------------\n\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"
+    "    -q, --quality <float>   Set video quality (0.0..1.0)\n"
     "    -S, --size <MB>         Set target size\n"
-       "    -b, --vb <kb/s>         Set video bitrate (default: 1000)\n"
-       "    -r, --rate              Set video framerate (" );
+    "    -b, --vb <kb/s>         Set video bitrate (default: 1000)\n"
+    "    -2, --two-pass          Use two-pass mode\n"
+    "    -T, --turbo             When using 2-pass use the turbo options\n"
+    "                            on the first pass to improve speed\n"
+    "                            (only works with x264, affects PSNR by about 0.05dB,\n"
+    "                            and increases first pass speed two to four times)\n"
+    "    -r, --rate              Set video framerate (" );
     for( i = 0; i < hb_video_rates_count; i++ )
     {
-        fprintf( stderr, hb_video_rates[i].string );
+        fprintf( out, hb_video_rates[i].string );
         if( i != hb_video_rates_count - 1 )
-            fprintf( stderr, "/" );
+            fprintf( out, "/" );
     }
-    fprintf( stderr, ")\n"
-       "\n"
-       "    -2, --two-pass          Use two-pass mode\n"
-     "    -d, --deinterlace       Deinterlace video with yadif/mcdeint filter\n"
-     "          <YM:FD:MM:QP>     (default 0:-1:-1:1)\n"
-     "           or\n"
-     "          <fast/slow/slower>\n"
-     "    -7, --deblock           Deblock video with pp7 filter\n"
-     "          <QP:M>            (default 0:2)\n"
-     "    -8, --denoise           Denoise video with hqdn3d filter\n"
-     "          <SL:SC:TL:TC>     (default 4:3:6:4.5)\n"
-     "           or\n"
-     "          <weak/medium/strong>\n"
-     "    -9, --detelecine        Detelecine video with pullup filter\n"
-     "          <L:R:T:B:SB:MP>   (default 1:1:4:4:0:0)\n"
-     "    -5, --decomb           Selectively deinterlaces when it detects combing\n"
-     "          <M:EQ:DF:TR:EQ:DF:TR>     (default: 4:10:15:9:10:35:9)\n"
-    "    -g, --grayscale         Grayscale encoding\n"
-    "    -p, --pixelratio        Store pixel aspect ratio in video stream\n"
-    "    -P, --loosePixelratio   Store pixel aspect ratio with specified width\n"
-    "          <MOD:PARX:PARY>   Takes as optional arguments what number you want\n"
-    "                            the dimensions to divide cleanly by (default 16)\n"
-    "                            and the pixel ratio to use (default autodetected)\n)"
-
-
-       "\n"
+    fprintf( out, ")\n"
+    "                            Be aware that not specifying a framerate lets\n"
+    "                            HandBrake preserve a source's time stamps,\n"
+    "                            potentially creating variable framerate video\n"
+    "    --vfr, --cfr, --pfr     Select variable, constant or peak-limited\n"
+    "                            frame rate control. VFR preserves the source\n"
+    "                            timing. CFR makes the output constant rate at\n"
+    "                            the rate given by the -r flag (or the source's\n"
+    "                            average rate if no -r is given). PFR doesn't\n"
+    "                            allow the rate to go over the rate specified\n"
+    "                            with the -r flag but won't change the source\n"
+    "                            timing if it's below that rate.\n"
+    "                            If none of these flags are given, the default\n"
+    "                            is --cfr when -r is given and --vfr otherwise\n"
 
-
-       "### Audio Options-----------------------------------------------------------\n\n"
-       "    -a, --audio <string>    Select audio channel(s), separated by commas\n"
+    "\n"
+    "### Audio Options-----------------------------------------------------------\n\n"
+    "    -a, --audio <string>    Select audio track(s), separated by commas\n"
     "                            More than one output track can be used for one\n"
     "                            input.\n"
     "                            (\"none\" for no audio, \"1,2,3\" for multiple\n"
-    "                             tracks, default: first one)\n"
-    "    -E, --aencoder <string> Audio encoder(s) (faac/lame/vorbis/ac3) \n"
-       "                            ac3 meaning passthrough\n"
-       "                            Seperated by commas for more than one audio track.\n"
-       "                            (default: guessed)\n"
-       "    -B, --ab <kb/s>         Set audio bitrate(s)  (default: 128)\n"
-    "                            Seperated by commas for more than one audio track.\n"
-       "    -6, --mixdown <string>  Format(s) for surround sound downmixing\n"
-    "                            Seperated by commas for more than one audio track.\n"
+    "                             tracks, default: first one)\n" );
+
+#ifdef __APPLE_CC__
+    fprintf( out,
+    "    -E, --aencoder <string> Audio encoder(s) (ca_aac/faac/lame/vorbis/ac3/dts) \n"
+    "                            ac3 and dts meaning passthrough\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "                            (default: guessed)\n" );
+#else
+    fprintf( out,
+    "    -E, --aencoder <string> Audio encoder(s) (faac/lame/vorbis/ac3/dts) \n"
+    "                            ac3 and dts meaning passthrough\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "                            (default: guessed)\n" );
+#endif
+    fprintf( out,
+    "    -B, --ab <kb/s>         Set audio bitrate(s)  (default: 160)\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "    -6, --mixdown <string>  Format(s) for surround sound downmixing\n"
+    "                            Separated by commas for more than one audio track.\n"
     "                            (mono/stereo/dpl1/dpl2/6ch, default: dpl2)\n"
     "    -R, --arate             Set audio samplerate(s) (" );
     for( i = 0; i < hb_audio_rates_count; i++ )
     {
-        fprintf( stderr, hb_audio_rates[i].string );
+        fprintf( out, hb_audio_rates[i].string );
         if( i != hb_audio_rates_count - 1 )
-            fprintf( stderr, "/" );
+            fprintf( out, "/" );
     }
-    fprintf( stderr, " kHz)\n"
-    "                            Seperated by commas for more than one audio track.\n"
+    fprintf( out, " kHz)\n"
+    "                            Separated by commas for more than one audio track.\n"
     "    -D, --drc <float>       Apply extra dynamic range compression to the audio,\n"
     "                            making soft sounds louder. Range is 1.0 to 4.0\n"
     "                            (too loud), with 1.5 - 2.5 being a useful range.\n"
-    "                            Seperated by commas for more than one audio track.\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "    -A, --aname <string>    Audio track name(s),\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "\n"
 
+    "### Picture Settings---------------------------------------------------------\n\n"
+    "    -w, --width <number>    Set picture width\n"
+    "    -l, --height <number>   Set picture height\n"
+    "        --crop <T:B:L:R>    Set cropping values (default: autocrop)\n"
+    "    -Y, --maxHeight <#>     Set maximum height\n"
+    "    -X, --maxWidth <#>      Set maximum width\n"
+    "    --strict-anamorphic     Store pixel aspect ratio in video stream\n"
+    "    --loose-anamorphic      Store pixel aspect ratio with specified width\n"
+    "    --custom-anamorphic     Store pixel aspect ratio in video stream and\n"
+    "                            directly control all parameters.\n"
+    "    --display-width         Set the width to scale the actual pixels to\n"
+    "      <number>              at playback, for custom anamorphic.\n"
+    "    --keep-display-aspect   Preserve the source's display aspect ratio\n"
+    "                            when using custom anamorphic\n"
+    "    --pixel-aspect          Set a custom pixel aspect for custom anamorphic\n"
+    "      <PARX:PARY>\n"
+    "                            (--display-width and --pixel-aspect are mutually\n"
+    "                             exclusive and the former will override the latter)\n"
+    "    --itu-par               Use wider, ITU pixel aspect values for loose and\n"
+    "                            custom anamorphic, useful with underscanned sources\n"
+    "    --modulus               Set the number you want the scaled pixel dimensions\n"
+    "      <number>              to divide cleanly by. Does not affect strict\n"
+    "                            anamorphic mode, which is always mod 2 (default: 16)\n"
+    "    -M  --color-matrix      Set the color space signaled by the output\n"
+    "          <601 or 709>      (Bt.601 is mostly for SD content, Bt.709 for HD,\n"
+    "                             default: set by resolution)\n"
+    "\n"
 
-       "\n"
+    "### Filters---------------------------------------------------------\n\n"
+
+     "    -d, --deinterlace       Deinterlace video with yadif/mcdeint filter\n"
+     "          <YM:FD:MM:QP>     (default 0:-1:-1:1)\n"
+     "           or\n"
+     "          <fast/slow/slower>\n"
+     "    -5, --decomb            Selectively deinterlaces when it detects combing\n"
+     "          <MO:ME:MT:ST:BT:BX:BY:MG:VA:LA:DI:ER:NO:MD:PP:FD>\n"
+     "          (default: 7:2:6:9:80:16:16:10:20:20:4:2:50:24:1:-1)\n"
+     "    -9, --detelecine        Detelecine (ivtc) video with pullup filter\n"
+     "                            Note: this filter drops duplicate frames to\n"
+     "                            restore the pre-telecine framerate, unless you\n"
+     "                            specify a constant framerate (--rate 29.97)\n"
+     "          <L:R:T:B:SB:MP:FD>   (default 1:1:4:4:0:0:-1)\n"
+     "    -8, --denoise           Denoise video with hqdn3d filter\n"
+     "          <SL:SC:TL:TC>     (default 4:3:6:4.5)\n"
+     "           or\n"
+     "          <weak/medium/strong>\n"
+     "    -7, --deblock           Deblock video with pp7 filter\n"
+     "          <QP:M>            (default 5:2)\n"
+     "        --rotate            Flips images axes\n"
+     "          <M>               (default 3)\n"
+    "    -g, --grayscale         Grayscale encoding\n"
+    "\n"
+
+    "### Subtitle Options------------------------------------------------------------\n\n"
+    "    -s, --subtitle <string> Select subtitle track(s), separated by commas\n"
+    "                            More than one output track can be used for one\n"
+    "                            input.\n"
+    "                            (\"1,2,3\" for multiple tracks.\n"
+    "                            A special track name \"scan\" adds an extra 1st pass.\n"
+    "                            This extra pass scans subtitles matching the\n"
+    "                            language of the first audio or the language \n"
+    "                            selected by --native-language.\n"
+    "                            The one that's only used 10 percent of the time\n"
+    "                            or less is selected. This should locate subtitles\n"
+    "                            for short foreign language segments. Best used in\n"
+    "                            conjunction with --subtitle-forced.\n"
+    "    -F, --subtitle-forced   Only display subtitles from the selected stream if\n"
+    "          <string>          the subtitle has the forced flag set. May be used in\n"
+    "                            conjunction with \"scan\" track to auto-select\n"
+    "                            a stream if it contains forced subtitles.\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "                            (\"1,2,3\" for multiple tracks.\n"
+    "                            If \"string\" is omitted, the first trac is forced.\n"
+    "        --subtitle-burn     \"Burn\" the selected subtitle into the video track\n"
+    "          <number>          If \"number\" is omitted, the first trac is burned.\n"
+    "        --subtitle-default  Flag the selected subtitle as the default subtitle\n"
+    "          <number>          to be displayed upon playback.  Setting no default\n"
+    "                            means no subtitle will be automatically displayed\n"
+    "                            If \"number\" is omitted, the first trac is default.\n"
+    "    -N, --native-language   Specifiy the your language preference. When the first\n"
+    "          <string>          audio track does not match your native language then\n"
+    "                            select the first subtitle that does. When used in\n"
+    "                            conjunction with --native-dub the audio track is\n"
+    "                            changed in preference to subtitles. Provide the\n"
+    "                            language's iso639-2 code (fre, eng, spa, dut, et cetera)\n"
+    "        --native-dub        Used in conjunction with --native-language\n"
+    "                            requests that if no audio tracks are selected the\n"
+    "                            default selected audio track will be the first one\n"
+    "                            that matches the --native-language. If there are no\n"
+    "                            matching audio tracks then the first matching\n"
+    "                            subtitle track is used instead.\n"
+    "        --srt-file <string> SubRip SRT filename(s), separated by commas.\n"
+    "        --srt-codeset       Character codeset(s) that the SRT file(s) are\n"
+    "          <string>          encoded in, separted by commas.\n"
+    "                            Use 'iconv -l' for a list of valid\n"
+    "                            codesets. If not specified latin1 is assumed\n"
+    "        --srt-offset        Offset in milli-seconds to apply to the SRT file(s)\n"
+    "          <string>          separted by commas. If not specified zero is assumed.\n"
+    "                            Offsets may be negative.\n"
+    "        --srt-lang <string> Language as an iso639-2 code fra, eng, spa et cetera)\n"
+    "                            for the SRT file(s) separated by commas. If not specified\n"
+    "                            then 'und' is used.\n"
+    "        --srt-default       Flag the selected srt as the default subtitle\n"
+    "          <number>          to be displayed upon playback.  Setting no default\n"
+    "                            means no subtitle will be automatically displayed\n"
+    "                            If \"number\" is omitted, the first srt is default.\n"
+    "                            \"number\" is an 1 based index into the srt-file list\n"
+    "\n"
 
 
-    "### Advanced Options---------------------------------------------------------\n\n"
-    "    -x, --x264opts <string> Specify advanced x264 options in the\n"
-    "                            same style as mencoder:\n"
-    "                            option1=value1:option2=value2\n"
-    "    -T, --turbo             When using 2-pass use the turbo options\n"
-    "                            on the first pass to improve speed\n"
-    "                            (only works with x264, affects PSNR by about 0.05dB,\n"
-    "                            and increases first pass speed two to four times)\n"
-    "    -V, --vfr               Perform variable framerate detelecine on NTSC video\n"
     );
 }
 
@@ -1566,41 +2428,85 @@ static void ShowHelp()
  ****************************************************************************/
 static void ShowPresets()
 {
-    printf("\n+ Animation:  -e x264 -b 1000 -B 160 -R 48 -E faac -f mkv --deinterlace=\"slower\" -m -p -2 -T -x ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2\n");
+    printf("\n< Apple\n");
+
+    printf("\n   + Universal:  -e x264  -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6\n");
+
+    printf("\n   + iPod:  -e x264  -b 700 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n");
+
+    printf("\n   + iPhone & iPod Touch:  -e x264  -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R 48 -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0\n");
+
+    printf("\n   + AppleTV:  -e x264  -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
 
-    printf("\n+ AppleTV:  -e x264 -b 2500 -B 160 -R 48 -E faac,ac3 -f mp4 -4 -m -p -x bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0\n");
+    printf("\n>\n");
 
-    printf("\n+ Bedlam:  -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1\n");
+    printf("\n< Regular\n");
 
-    printf("\n+ Blind:  -b 512 -B 128 -R 48 -E faac -f mp4 -w 512 -m\n");
+    printf("\n   + Normal:  -e x264  -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 --strict-anamorphic -m -x ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0\n");
 
-    printf("\n+ Broke:  -e x264 -S 695 -B 128 -R 48 -E faac -f mp4 -w 640 -m -2 -T -x ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip\n");
+    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
 
-    printf("\n+ Classic:  -b 1000 -B 160 -R 48 -E faac -f mp4\n");
+    printf("\n>\n");
 
-    printf("\n+ Constant Quality Rate:  -e x264 -q 0.64709997177124023 -E ac3 -f mkv -m -p -x ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh\n");
+    printf("\n< Legacy\n");
 
-    printf("\n+ Deux Six Quatre:  -e x264 -b 1600 -E ac3 -f mkv -m -p -2 -T -x ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip\n");
+    printf("\n   + Classic:  -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4\n");
 
-    printf("\n+ Film:  -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip\n");
+    printf("\n   + AppleTV Legacy:  -e x264  -b 2500 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n");
 
-    printf("\n+ iPhone / iPod Touch:  -e x264 -b 960 -B 128 -R 48 -E faac -f mp4 -I -w 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1\n");
+    printf("\n   + iPhone Legacy:  -e x264  -b 960 -a 1 -E faac -B 128 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0\n");
 
-    printf("\n+ iPod High-Rez:  -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -I -w 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
+    printf("\n   + iPod Legacy:  -e x264  -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0\n");
 
-    printf("\n+ iPod Low-Rez:  -e x264 -b 700 -B 160 -R 48 -E faac -f mp4 -I -w 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
+    printf("\n>\n");
+}
+
+static char * hb_strndup( char * str, int len )
+{
+       char * res;
+       int str_len = strlen( str );
+
+       res = malloc( len > str_len ? str_len + 1 : len + 1 );
+       strncpy( res, str, len );
+       res[len] = '\0';
+       return res;
+}
 
-    printf("\n+ Normal:  -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=2:bframes=2:subme=5:me=umh\n");
+static char** str_split( char *str, char delem )
+{
+    char *  pos;
+    char *  end;
+    char ** ret;
+    int     count, i;
 
-    printf("\n+ PS3:  -e x264 -b 2500 -B 160 -R 48 -E faac -f mp4 -p -x level=41:subme=5:me=umh\n");
+    if ( str == NULL || str[0] == 0 )
+    {
+        ret = malloc( sizeof(char*) );
+        *ret = NULL;
+        return ret;
+    }
 
-    printf("\n+ PSP:  -b 1024 -B 128 -R 48 -E faac -f mp4 -w 368 -l 208 -m\n");
+    // Find number of elements in the string
+    count = 1;
+    pos = str;
+    while ( ( pos = strchr( pos, delem ) ) != NULL )
+    {
+        count++;
+        pos++;
+    }
 
-    printf("\n+ QuickTime:  -e x264 -b 2000 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip\n");
+    ret = calloc( ( count + 1 ), sizeof(char*) );
 
-    printf("\n+ Television:  -e x264 -b 1300 -B 160 -R 48 -E faac -f mkv --deinterlace=\"slower\" --denoise=\"weak\" -m -2 -T -x ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip\n");
+    pos = str;
+    for ( i = 0; i < count - 1; i++ )
+    {
+        end = strchr( pos, delem );
+        ret[i] = hb_strndup(pos, end - pos);
+        pos = end + 1;
+    }
+    ret[i] = strdup(pos);
 
-    printf("\n+ Xbox 360:  -e x264 -b 2000 -B 160 -R 48 -E faac -f mp4 -p -x level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1\n");
+    return ret;
 }
 
 /****************************************************************************
@@ -1608,14 +2514,37 @@ static void ShowPresets()
  ****************************************************************************/
 static int ParseOptions( int argc, char ** argv )
 {
+    
+    #define PREVIEWS            257
+    #define START_AT_PREVIEW    258
+    #define START_AT            259
+    #define STOP_AT             260
+    #define ANGLE               261
+    #define DVDNAV              262
+    #define DISPLAY_WIDTH       263
+    #define PIXEL_ASPECT        264
+    #define MODULUS             265
+    #define KEEP_DISPLAY_ASPECT 266
+    #define SUB_BURNED          267
+    #define SUB_DEFAULT         268
+    #define NATIVE_DUB          269
+    #define SRT_FILE            270
+    #define SRT_CODESET         271
+    #define SRT_OFFSET          272
+    #define SRT_LANG            273
+    #define SRT_DEFAULT         274
+    #define ROTATE_FILTER       275
+    #define SCAN_ONLY           276
+    
     for( ;; )
     {
         static struct option long_options[] =
           {
             { "help",        no_argument,       NULL,    'h' },
             { "update",      no_argument,       NULL,    'u' },
-            { "verbose",     no_argument,       NULL,    'v' },
+            { "verbose",     optional_argument, NULL,    'v' },
             { "cpu",         required_argument, NULL,    'C' },
+            { "no-dvdnav",      no_argument,       NULL,    DVDNAV },
 
             { "format",      required_argument, NULL,    'f' },
             { "input",       required_argument, NULL,    'i' },
@@ -1625,17 +2554,25 @@ static int ParseOptions( int argc, char ** argv )
             { "ipod-atom",   no_argument,       NULL,    'I' },
 
             { "title",       required_argument, NULL,    't' },
+            { "scan",        no_argument,       NULL,    SCAN_ONLY },
             { "longest",     no_argument,       NULL,    'L' },
             { "chapters",    required_argument, NULL,    'c' },
+            { "angle",       required_argument, NULL,    ANGLE },
             { "markers",     optional_argument, NULL,    'm' },
             { "audio",       required_argument, NULL,    'a' },
             { "mixdown",     required_argument, NULL,    '6' },
             { "drc",         required_argument, NULL,    'D' },
             { "subtitle",    required_argument, NULL,    's' },
-            { "subtitle-scan", no_argument,     NULL,    'U' },
-            { "subtitle-forced", no_argument,   NULL,    'F' },
+            { "subtitle-forced", optional_argument,   NULL,    'F' },
+            { "subtitle-burned", optional_argument,   NULL,    SUB_BURNED },
+            { "subtitle-default", optional_argument,   NULL,    SUB_DEFAULT },
+            { "srt-file",    required_argument, NULL, SRT_FILE },
+            { "srt-codeset", required_argument, NULL, SRT_CODESET },
+            { "srt-offset",  required_argument, NULL, SRT_OFFSET },
+            { "srt-lang",    required_argument, NULL, SRT_LANG },
+            { "srt-default",    optional_argument, NULL, SRT_DEFAULT },
             { "native-language", required_argument, NULL,'N' },
-
+            { "native-dub",  no_argument,       NULL,    NATIVE_DUB },
             { "encoder",     required_argument, NULL,    'e' },
             { "aencoder",    required_argument, NULL,    'E' },
             { "two-pass",    no_argument,       NULL,    '2' },
@@ -1645,8 +2582,15 @@ static int ParseOptions( int argc, char ** argv )
             { "detelecine",  optional_argument, NULL,    '9' },
             { "decomb",      optional_argument, NULL,    '5' },
             { "grayscale",   no_argument,       NULL,    'g' },
-            { "pixelratio",  no_argument,       NULL,    'p' },
-            { "loosePixelratio", optional_argument,   NULL,    'P' },
+            { "rotate",      optional_argument, NULL,   ROTATE_FILTER },
+            { "strict-anamorphic",  no_argument, &anamorphic_mode, 1 },
+            { "loose-anamorphic", no_argument, &anamorphic_mode, 2 },
+            { "custom-anamorphic", no_argument, &anamorphic_mode, 3 },
+            { "display-width", required_argument, NULL, DISPLAY_WIDTH },
+            { "keep-display-aspect", no_argument, &keep_display_aspect, 1 },
+            { "pixel-aspect", required_argument, NULL, PIXEL_ASPECT },
+            { "modulus",     required_argument, NULL, MODULUS },
+            { "itu-par",     no_argument,       &itu_par, 1  },
             { "width",       required_argument, NULL,    'w' },
             { "height",      required_argument, NULL,    'l' },
             { "crop",        required_argument, NULL,    'n' },
@@ -1657,15 +2601,22 @@ static int ParseOptions( int argc, char ** argv )
             { "ab",          required_argument, NULL,    'B' },
             { "rate",        required_argument, NULL,    'r' },
             { "arate",       required_argument, NULL,    'R' },
-            { "cqp",         no_argument,       NULL,    'Q' },
             { "x264opts",    required_argument, NULL,    'x' },
             { "turbo",       no_argument,       NULL,    'T' },
             { "maxHeight",   required_argument, NULL,    'Y' },
             { "maxWidth",    required_argument, NULL,    'X' },
             { "preset",      required_argument, NULL,    'Z' },
             { "preset-list", no_argument,       NULL,    'z' },
-            { "vfr",         no_argument,       NULL,    'V' },
 
+            { "aname",       required_argument, NULL,    'A' },
+            { "color-matrix",required_argument, NULL,    'M' },
+            { "previews",    required_argument, NULL,    PREVIEWS },
+            { "start-at-preview", required_argument, NULL, START_AT_PREVIEW },
+            { "start-at",    required_argument, NULL,    START_AT },
+            { "stop-at",    required_argument, NULL,     STOP_AT },
+            { "vfr",         no_argument,       &cfr,    0 },
+            { "cfr",         no_argument,       &cfr,    1 },
+            { "pfr",         no_argument,       &cfr,    2 },
             { 0, 0, 0, 0 }
           };
 
@@ -1673,7 +2624,7 @@ static int ParseOptions( int argc, char ** argv )
         int c;
 
                c = getopt_long( argc, argv,
-                                                "hvuC:f:4i:Io:t:Lc:m::a:6:s:UFN:e:E:2dD:7895gpOP::w:l:n:b:q:S:B:r:R:Qx:TY:X:VZ:z",
+                                                "hv::uC:f:4i:Io:t:Lc:m::M:a:A:6:s:UF::N:e:E:2dD:7895gOw:l:n:b:q:S:B:r:R:x:TY:X:Z:z",
                          long_options, &option_index );
         if( c < 0 )
         {
@@ -1682,6 +2633,9 @@ static int ParseOptions( int argc, char ** argv )
 
         switch( c )
         {
+            case 0:
+                /* option was handled entirely in getopt_long */
+                break;
             case 'h':
                 ShowHelp();
                 exit( 0 );
@@ -1689,7 +2643,14 @@ static int ParseOptions( int argc, char ** argv )
                 update = 1;
                 break;
             case 'v':
-                debug = HB_DEBUG_ALL;
+                if( optarg != NULL )
+                {
+                    debug = atoi( optarg );
+                }
+                else
+                {
+                    debug = 1;
+                }
                 break;
             case 'C':
                 cpu = atoi( optarg );
@@ -1702,26 +2663,28 @@ static int ParseOptions( int argc, char ** argv )
             case 'z':
                 ShowPresets();
                 exit ( 0 );
+            case DVDNAV:
+                dvdnav = 0;
+                break;
 
             case 'f':
                 format = strdup( optarg );
                 break;
             case 'i':
                 input = strdup( optarg );
-                #ifdef __APPLE_CC__
-                char *devName = bsd_name_for_path( input );
-                if( devName == NULL )
-                {
-                    return 0;
-                }
-                if( device_is_dvd( devName ) )
+#ifdef __APPLE_CC__
+                char *devName = bsd_name_for_path( input ); // alloc
+                if( devName )
                 {
-                    char *newInput = malloc( strlen("/dev/") + strlen( devName ) + 1);
-                    sprintf( newInput, "/dev/%s", devName );
-                    free(input);
-                    input = newInput;
+                    if( device_is_dvd( devName ))
+                    {
+                        free( input );
+                        input = malloc( strlen( "/dev/" ) + strlen( devName ) + 1 );
+                        sprintf( input, "/dev/%s", devName );
+                    }
+                    free( devName );
                 }
-                #endif
+#endif
                 break;
             case 'o':
                 output = strdup( optarg );
@@ -1739,6 +2702,9 @@ static int ParseOptions( int argc, char ** argv )
             case 't':
                 titleindex = atoi( optarg );
                 break;
+            case SCAN_ONLY:
+                titlescan = 1;
+                break;
             case 'L':
                 longest_title = 1;
                 break;
@@ -1763,6 +2729,9 @@ static int ParseOptions( int argc, char ** argv )
                 }
                 break;
             }
+            case ANGLE:
+                angle = atoi( optarg );
+                break;
             case 'm':
                 if( optarg != NULL )
                 {
@@ -1774,6 +2743,7 @@ static int ParseOptions( int argc, char ** argv )
                 if( optarg != NULL )
                 {
                     atracks = strdup( optarg );
+                    audio_explicit = 1;
                 }
                 else
                 {
@@ -1793,17 +2763,59 @@ static int ParseOptions( int argc, char ** argv )
                 }
                 break;
             case 's':
-                sub = atoi( optarg );
-                break;
-            case 'U':
-                subtitle_scan = 1;
+                subtracks = str_split( optarg, ',' );
                 break;
             case 'F':
-                subtitle_force = 1;
+                subforce = str_split( optarg, ',' );
+                break;
+            case SUB_BURNED:
+                if( optarg != NULL )
+                {
+                    subburn = strdup( optarg );
+                }
+                else
+                {
+                    subburn = "" ;
+                }
+                break;
+            case SUB_DEFAULT:
+                if( optarg != NULL )
+                {
+                    subdefault = strdup( optarg );
+                }
+                else
+                {
+                    subdefault = "" ;
+                }
                 break;
             case 'N':
                 native_language = strdup( optarg );
                 break;
+            case NATIVE_DUB:
+                native_dub = 1;
+                break;
+            case SRT_FILE:
+                srtfile = str_split( optarg, ',' );
+                break;
+            case SRT_CODESET:
+                srtcodeset = str_split( optarg, ',' );
+                break;
+            case SRT_OFFSET:
+                srtoffset = str_split( optarg, ',' );
+                break;
+            case SRT_LANG:
+                srtlang = str_split( optarg, ',' );
+                break;
+            case SRT_DEFAULT:
+                if( optarg != NULL )
+                {
+                    srtdefault = atoi( optarg );
+                }
+                else
+                {
+                    srtdefault = 1 ;
+                }
+                break;
             case '2':
                 twoPass = 1;
                 break;
@@ -1875,14 +2887,29 @@ static int ParseOptions( int argc, char ** argv )
             case 'g':
                 grayscale = 1;
                 break;
-            case 'p':
-                pixelratio = 1;
+            case ROTATE_FILTER:
+                if( optarg != NULL )
+                {
+                    rotate_opt = strdup( optarg );
+                }
+                rotate = 1;
+                break;
+            case DISPLAY_WIDTH:
+                if( optarg != NULL )
+                {
+                    sscanf( optarg, "%i", &display_width );
+                }
+                break;
+            case PIXEL_ASPECT:
+                if( optarg != NULL )
+                {
+                    sscanf( optarg, "%i:%i", &par_width, &par_height );
+                }
                 break;
-            case 'P':
-                loosePixelratio = 1;
+            case MODULUS:
                 if( optarg != NULL )
                 {
-                    sscanf( optarg, "%i:%i:%i", &modulus, &par_width, &par_height );
+                    sscanf( optarg, "%i", &modulus );
                 }
                 break;
             case 'e':
@@ -1890,10 +2917,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;
@@ -1959,6 +2982,10 @@ static int ParseOptions( int argc, char ** argv )
                 {
                     fprintf( stderr, "invalid framerate %s\n", optarg );
                 }
+                else if ( cfr == 0 )
+                {
+                    cfr = 1;
+                }
                 break;
             }
             case 'R':
@@ -1982,9 +3009,6 @@ static int ParseOptions( int argc, char ** argv )
                     abitrates = strdup( optarg );
                 }
                 break;
-            case 'Q':
-                crf = 0;
-                break;
             case 'x':
                 x264opts = strdup( optarg );
                 break;
@@ -1997,10 +3021,64 @@ static int ParseOptions( int argc, char ** argv )
             case 'X':
                 maxWidth = atoi (optarg );
                 break;
-            case 'V':
-                vfr = 1;
+            case 'A':
+                if( optarg != NULL )
+                {
+                    anames = strdup( optarg );
+                }
+                break;
+            case PREVIEWS:
+                sscanf( optarg, "%i:%i", &preview_count, &store_previews );
+                break;
+            case START_AT_PREVIEW:
+                start_at_preview = atoi( optarg );
+                break;
+            case START_AT:
+                start_at_string = strdup( optarg );
+                start_at_token = strtok( start_at_string, ":");
+                if( !strcmp( start_at_token, "frame" ) )
+                {
+                    start_at_token = strtok( NULL, ":");
+                    start_at_frame = atoi(start_at_token);
+                }
+                else if( !strcmp( start_at_token, "pts" ) )
+                {
+                    start_at_token = strtok( NULL, ":");
+                    sscanf( start_at_token, "%"SCNd64, &start_at_pts );
+                }
+                else if( !strcmp( start_at_token, "duration" ) )
+                {
+                    start_at_token = strtok( NULL, ":");
+                    sscanf( start_at_token, "%"SCNd64, &start_at_pts );
+                    start_at_pts *= 90000LL;
+                }
+                break;
+            case STOP_AT:
+                stop_at_string = strdup( optarg );
+                stop_at_token = strtok( stop_at_string, ":");
+                if( !strcmp( stop_at_token, "frame" ) )
+                {
+                    stop_at_token = strtok( NULL, ":");
+                    stop_at_frame = atoi(stop_at_token);
+                }
+                else if( !strcmp( stop_at_token, "pts" ) )
+                {
+                    stop_at_token = strtok( NULL, ":");
+                    sscanf( stop_at_token, "%"SCNd64, &stop_at_pts );
+                }
+                else if( !strcmp( stop_at_token, "duration" ) )
+                {
+                    stop_at_token = strtok( NULL, ":");
+                    sscanf( stop_at_token, "%"SCNd64, &stop_at_pts );
+                    stop_at_pts *= 90000LL;
+                }
+                break;
+            case 'M':
+                if( atoi( optarg ) == 601 )
+                    color_matrix = 1;
+                else if( atoi( optarg ) == 709 )
+                    color_matrix = 2;
                 break;
-
             default:
                 fprintf( stderr, "unknown option (%s)\n", argv[optind] );
                 return -1;
@@ -2025,7 +3103,7 @@ static int CheckOptions( int argc, char ** argv )
     }
 
     /* Parse format */
-    if( titleindex > 0 )
+    if( titleindex > 0 && !titlescan )
     {
         if( output == NULL || *output == '\0' )
         {
@@ -2039,12 +3117,7 @@ static int CheckOptions( int argc, char ** argv )
             char * p = strrchr( output, '.' );
 
             /* autodetect */
-            if( p && !strcasecmp( p, ".avi" ) )
-            {
-                mux = HB_MUX_AVI;
-                default_acodec = HB_ACODEC_LAME;
-            }
-            else if( p && ( !strcasecmp( p, ".mp4" )  ||
+            if( p && ( !strcasecmp( p, ".mp4" )  ||
                             !strcasecmp( p, ".m4v" ) ) )
             {
                 if ( h264_30 == 1 )
@@ -2053,12 +3126,6 @@ static int CheckOptions( int argc, char ** argv )
                     mux = HB_MUX_MP4;
                 default_acodec = HB_ACODEC_FAAC;
             }
-            else if( p && ( !strcasecmp( p, ".ogm" ) ||
-                            !strcasecmp( p, ".ogg" ) ) )
-            {
-                mux = HB_MUX_OGM;
-                default_acodec = HB_ACODEC_VORBIS;
-            }
             else if( p && !strcasecmp(p, ".mkv" ) )
             {
                 mux = HB_MUX_MKV;
@@ -2071,11 +3138,6 @@ static int CheckOptions( int argc, char ** argv )
                 return 0;
             }
         }
-        else if( !strcasecmp( format, "avi" ) )
-        {
-            mux = HB_MUX_AVI;
-            default_acodec = HB_ACODEC_LAME;
-        }
         else if( !strcasecmp( format, "mp4" ) ||
                  !strcasecmp( format, "m4v" ) )
         {
@@ -2085,12 +3147,6 @@ static int CheckOptions( int argc, char ** argv )
                 mux = HB_MUX_MP4;
             default_acodec = HB_ACODEC_FAAC;
         }
-        else if( !strcasecmp( format, "ogm" ) ||
-                 !strcasecmp( format, "ogg" ) )
-        {
-            mux = HB_MUX_OGM;
-            default_acodec = HB_ACODEC_VORBIS;
-        }
         else if( !strcasecmp( format, "mkv" ) )
         {
             mux = HB_MUX_MKV;
@@ -2099,7 +3155,7 @@ static int CheckOptions( int argc, char ** argv )
         else
         {
             fprintf( stderr, "Invalid output format (%s). Possible "
-                     "choices are avi, mp4, m4v, ogm, ogg and mkv\n.", format );
+                     "choices are mp4, m4v and mkv\n.", format );
             return 1;
         }
     }
@@ -2129,6 +3185,12 @@ static int get_acodec_for_string( char *codec )
     {
         return HB_ACODEC_VORBIS;
     }
+#ifdef __APPLE__
+    else if( !strcasecmp( codec, "ca_aac") )
+    {
+        return HB_ACODEC_CA_AAC;
+    }
+#endif
     else
     {
         return -1;
@@ -2181,10 +3243,20 @@ static char* bsd_name_for_path(char *path)
         return NULL;
     }
 
-    // A version 4 GetVolParmsInfoBuffer contains the BSD node name in the
-    // vMDeviceID field. It is actually a char * value. This is mentioned in the
-    // header CoreServices/CarbonCore/Files.h.
-    return volumeParms.vMDeviceID;
+    // A version 4 GetVolParmsInfoBuffer contains the BSD node name in the vMDeviceID field.
+    // It is actually a char * value. This is mentioned in the header CoreServices/CarbonCore/Files.h.
+    if( volumeParms.vMVersion < 4 )
+    {
+        return NULL;
+    }
+
+    // vMDeviceID might be zero as is reported with experimental ZFS (zfs-119) support in Leopard.
+    if( !volumeParms.vMDeviceID )
+    {
+        return NULL;
+    }
+
+    return strdup( volumeParms.vMDeviceID );
 }
 
 /****************************************************************************
@@ -2281,7 +3353,7 @@ static int is_dvd_service( io_service_t service )
  * The whole media object is indicated in the IORegistry by the presence of a
  * property with the key "Whole" and value "Yes".
  ****************************************************************************/
-static is_whole_media_service( io_service_t service )
+static int is_whole_media_service( io_service_t service )
 {
     int result = 0;