X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest.c;h=c75482f0cbaffc5b663ad16d9c46df776ad6f54e;hb=91808a1f62713db501fada2de3ba4fcabfff0b7a;hp=5e15c8392ba4b47e74bf75db42c029dab7884b3b;hpb=d6a4ae73b86cca10f2342c9e26c132855cad6356;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/test/test.c b/test/test.c index 5e15c839..c75482f0 100644 --- a/test/test.c +++ b/test/test.c @@ -30,9 +30,9 @@ #endif /* Options */ -static int debug = HB_DEBUG_NONE; +static int debug = HB_DEBUG_ALL; static int update = 0; -static int dvdnav = 0; +static int dvdnav = 1; static char * input = NULL; static char * output = NULL; static char * format = NULL; @@ -76,6 +76,7 @@ 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; @@ -98,7 +99,6 @@ 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; @@ -409,12 +409,19 @@ 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" ); @@ -583,7 +590,6 @@ static int HandleEvents( hb_handle_t * h ) } vcodec = HB_VCODEC_X264; job->vquality = 20.0; - job->crf = 1; if( !atracks ) { atracks = strdup("1,1"); @@ -611,7 +617,7 @@ static int HandleEvents( hb_handle_t * h ) maxWidth = 720; if( !x264opts ) { - x264opts = strdup("cabac=0:ref=2:mixed-refs=1:me=umh"); + x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6"); } anamorphic_mode = 2; job->chapter_markers = 1; @@ -653,7 +659,7 @@ static int HandleEvents( hb_handle_t * h ) 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"); + 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; } @@ -666,7 +672,6 @@ static int HandleEvents( hb_handle_t * h ) } vcodec = HB_VCODEC_X264; job->vquality = 20.0; - job->crf = 1; if( !atracks ) { atracks = strdup("1"); @@ -694,7 +699,7 @@ static int HandleEvents( hb_handle_t * h ) maxWidth = 480; if( !x264opts ) { - x264opts = strdup("cabac=0:ref=2:mixed-refs:me=umh"); + x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0"); } job->chapter_markers = 1; } @@ -708,7 +713,6 @@ static int HandleEvents( hb_handle_t * h ) job->largeFileSize = 1; vcodec = HB_VCODEC_X264; job->vquality = 20.0; - job->crf = 1; if( !atracks ) { atracks = strdup("1,1"); @@ -736,7 +740,7 @@ static int HandleEvents( hb_handle_t * h ) maxWidth = 960; if( !x264opts ) { - x264opts = strdup("cabac=0:ref=2:mixed-refs=1:bframes=3:me=umh:subme=7:b-adapt=2:8x8dct=1"); + x264opts = strdup("cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0"); } anamorphic_mode = 2; job->chapter_markers = 1; @@ -750,7 +754,6 @@ static int HandleEvents( hb_handle_t * h ) } vcodec = HB_VCODEC_X264; job->vquality = 20.0; - job->crf = 1; if( !atracks ) { atracks = strdup("1"); @@ -777,7 +780,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !x264opts ) { - x264opts = strdup("ref=2:bframes=2:me=umh"); + x264opts = strdup("ref=2:bframes=2:me=umh:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0"); } anamorphic_mode = 1; job->chapter_markers = 1; @@ -791,7 +794,6 @@ static int HandleEvents( hb_handle_t * h ) } vcodec = HB_VCODEC_X264; job->vquality = 20.0; - job->crf = 1; if( !atracks ) { atracks = strdup("1,1"); @@ -818,7 +820,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !x264opts ) { - x264opts = strdup("ref=3:mixed-refs:bframes=3:weightb:b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:8x8dct"); + x264opts = strdup("b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:trellis=0"); } detelecine = 1; decomb = 1; @@ -894,7 +896,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !x264opts ) { - x264opts = strdup("bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0"); + 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; @@ -936,7 +938,7 @@ static int HandleEvents( hb_handle_t * h ) maxWidth = 480; if( !x264opts ) { - x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0"); + 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; } @@ -977,7 +979,7 @@ static int HandleEvents( hb_handle_t * h ) 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"); + 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; } @@ -1374,7 +1376,8 @@ static int HandleEvents( hb_handle_t * h ) } } - if( hb_list_count(audios) == 0 ) + 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)); @@ -1821,8 +1824,9 @@ static int HandleEvents( hb_handle_t * h ) { lang = srtlang[i]; } + sub_config.default_track = + ( srtdefault != -1 ) && ( srtdefault == i + 1 ); sub_config.force = 0; - sub_config.default_track = 0; strncpy( sub_config.src_filename, srtfile[i], 128); strncpy( sub_config.src_codeset, codeset, 40); sub_config.offset = offset; @@ -1927,11 +1931,6 @@ static int HandleEvents( hb_handle_t * h ) job->file = strdup( output ); - if( crf ) - { - job->crf = 1; - } - if( color_matrix ) { job->color_matrix = color_matrix; @@ -2159,7 +2158,8 @@ static void ShowHelp() " 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" - " --dvdnav Use dvdnav (Experimental)\n" + " --no-dvdnav Do not use dvdnav for reading DVDs\n" + " (experimental, enabled by default for testing)\n" "\n" "### Source Options-----------------------------------------------------------\n\n" @@ -2181,7 +2181,7 @@ static void ShowHelp() "### Destination Options------------------------------------------------------\n\n" " -o, --output Set output file name\n" - " -f, --format Set output format (avi/mp4/ogm/mkv, default:\n" + " -f, --format 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" @@ -2198,7 +2198,6 @@ static void ShowHelp() " same style as mencoder:\n" " option1=value1:option2=value2\n" " -q, --quality Set video quality (0.0..1.0)\n" - " -Q, --cqp Use with -q for CQP instead of CRF\n" " -S, --size Set target size\n" " -b, --vb Set video bitrate (default: 1000)\n" " -2, --two-pass Use two-pass mode\n" @@ -2307,12 +2306,13 @@ static void ShowHelp() " or\n" " \n" " -5, --decomb Selectively deinterlaces when it detects combing\n" - " (default: 1:2:6:9:80:16:16)\n" + " \n" + " (default: 7:2:6:9:80:16:16:10:20:20:4:2:50:24:-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" - " (default 1:1:4:4:0:0)\n" + " (default 1:1:4:4:0:0:-1)\n" " -8, --denoise Denoise video with hqdn3d filter\n" " (default 4:3:6:4.5)\n" " or\n" @@ -2345,7 +2345,7 @@ static void ShowHelp() " --subtitle-burn \"Burn\" the selected subtitle into the video track\n" " If \"number\" is omitted, the first trac is burned.\n" " --subtitle-default Flag the selected subtitle as the default subtitle\n" - " to be displayed upon playback. Settings no default\n" + " 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" @@ -2371,6 +2371,11 @@ static void ShowHelp() " --srt-lang 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" + " 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" @@ -2384,21 +2389,21 @@ static void ShowPresets() { 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:mixed-refs=1:me=umh\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\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:mixed-refs:me=umh\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:mixed-refs=1:bframes=3:me=umh:subme=7:b-adapt=2:8x8dct=1\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\n"); printf("\n>\n"); printf("\n< Regular\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:me=umh\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:me=umh:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0\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 ref=3:mixed-refs:bframes=3:weightb:b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:8x8dct\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-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:trellis=0\n"); printf("\n>\n"); @@ -2406,24 +2411,34 @@ static void ShowPresets() printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4\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 bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0\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 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\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 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\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>\n"); } -static char** str_split( char *str, char *delem ) +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; +} + +static char** str_split( char *str, char delem ) { - char * token; - char * copy_str; char * pos; + char * end; char ** ret; int count, i; - if ( str == NULL || delem == NULL || str[0] == 0 ) + if ( str == NULL || str[0] == 0 ) { ret = malloc( sizeof(char*) ); *ret = NULL; @@ -2433,24 +2448,23 @@ static char** str_split( char *str, char *delem ) // Find number of elements in the string count = 1; pos = str; - while ( ( pos = strstr( pos+1, delem ) ) != NULL ) + while ( ( pos = strchr( pos, delem ) ) != NULL ) { - if ( *(pos+1) != 0 ) - count++; + count++; + pos++; } - ret = calloc( ( count + 1 ), sizeof(char*) ); - copy_str = strdup( str ); - token = strtok( copy_str, delem ); + ret = calloc( ( count + 1 ), sizeof(char*) ); - i = 0; - while( token != NULL && i < count ) + pos = str; + for ( i = 0; i < count - 1; i++ ) { - ret[i] = strdup( token ); - token = strtok(NULL, ","); - i++; + end = strchr( pos, delem ); + ret[i] = hb_strndup(pos, end - pos); + pos = end + 1; } - free( copy_str ); + ret[i] = strdup(pos); + return ret; } @@ -2476,6 +2490,7 @@ static int ParseOptions( int argc, char ** argv ) #define SRT_CODESET 270 #define SRT_OFFSET 271 #define SRT_LANG 272 + #define SRT_DEFAULT 273 for( ;; ) { @@ -2485,7 +2500,7 @@ static int ParseOptions( int argc, char ** argv ) { "update", no_argument, NULL, 'u' }, { "verbose", optional_argument, NULL, 'v' }, { "cpu", required_argument, NULL, 'C' }, - { "dvdnav", no_argument, NULL, DVDNAV }, + { "no-dvdnav", no_argument, NULL, DVDNAV }, { "format", required_argument, NULL, 'f' }, { "input", required_argument, NULL, 'i' }, @@ -2510,6 +2525,7 @@ static int ParseOptions( int argc, char ** argv ) { "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' }, @@ -2539,7 +2555,6 @@ 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' }, @@ -2562,7 +2577,7 @@ static int ParseOptions( int argc, char ** argv ) int c; c = getopt_long( argc, argv, - "hv::uC:f:4i:Io:t:Lc:m::M:a:A:6:s:UFN:e:E:2dD:7895gOw:l:n:b:q:S:B:r:R:Qx:TY:X:Z: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 ) { @@ -2602,7 +2617,7 @@ static int ParseOptions( int argc, char ** argv ) ShowPresets(); exit ( 0 ); case DVDNAV: - dvdnav = 1; + dvdnav = 0; break; case 'f': @@ -2698,10 +2713,10 @@ static int ParseOptions( int argc, char ** argv ) } break; case 's': - subtracks = str_split( optarg, "," ); + subtracks = str_split( optarg, ',' ); break; case 'F': - subforce = str_split( optarg, "," ); + subforce = str_split( optarg, ',' ); break; case SUB_BURNED: if( optarg != NULL ) @@ -2730,16 +2745,26 @@ static int ParseOptions( int argc, char ** argv ) native_dub = 1; break; case SRT_FILE: - srtfile = str_split( optarg, "," ); + srtfile = str_split( optarg, ',' ); break; case SRT_CODESET: - srtcodeset = str_split( optarg, "," ); + srtcodeset = str_split( optarg, ',' ); break; case SRT_OFFSET: - srtoffset = str_split( optarg, "," ); + srtoffset = str_split( optarg, ',' ); break; case SRT_LANG: - srtlang = str_split( optarg, "," ); + srtlang = str_split( optarg, ',' ); + break; + case SRT_DEFAULT: + if( optarg != NULL ) + { + srtdefault = atoi( optarg ); + } + else + { + srtdefault = 1 ; + } break; case '2': twoPass = 1; @@ -2927,9 +2952,6 @@ static int ParseOptions( int argc, char ** argv ) abitrates = strdup( optarg ); } break; - case 'Q': - crf = 0; - break; case 'x': x264opts = strdup( optarg ); break; @@ -3018,12 +3040,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 ) @@ -3032,12 +3049,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; @@ -3050,11 +3061,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" ) ) { @@ -3064,12 +3070,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; @@ -3078,7 +3078,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; } }