diff options
| author | jstebbins <[email protected]> | 2010-10-23 19:11:31 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-10-23 19:11:31 +0000 |
| commit | 71339bee34b6dbc248ee2027ead281369f02024c (patch) | |
| tree | ff7459e51ab72d48a58b4b0a5bb59284523f7eca /test | |
| parent | a31c919e771257d81192439f3afcea0f444a27bc (diff) | |
clean up crufty legacy code
remove unused code relating to avi, ogm, psp, ipod, and forcing h264 levels
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3622 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.c | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/test/test.c b/test/test.c index 2af240882..a2a8b55af 100644 --- a/test/test.c +++ b/test/test.c @@ -62,8 +62,6 @@ static int rotate = 0; static char * rotate_opt = 0; static int grayscale = 0; static int vcodec = HB_VCODEC_FFMPEG; -static int h264_13 = 0; -static int h264_30 = 0; static hb_list_t * audios = NULL; static hb_audio_config_t * audio = NULL; static int num_audio_tracks = 0; @@ -1356,14 +1354,6 @@ static int HandleEvents( hb_handle_t * h ) { job->vcodec = vcodec; } - if( h264_13 ) - { - job->h264_level = 13; - } - if( h264_30 ) - { - job->h264_level = 30; - } if( vrate ) { job->cfr = cfr; @@ -3081,16 +3071,6 @@ static int ParseOptions( int argc, char ** argv ) { vcodec = HB_VCODEC_X264; } - else if( !strcasecmp( optarg, "x264b13" ) ) - { - vcodec = HB_VCODEC_X264; - h264_13 = 1; - } - else if( !strcasecmp( optarg, "x264b30" ) ) - { - vcodec = HB_VCODEC_X264; - h264_30 = 1; - } else if( !strcasecmp( optarg, "theora" ) ) { vcodec = HB_VCODEC_THEORA; @@ -3382,12 +3362,9 @@ static int CheckOptions( int argc, char ** argv ) /* autodetect */ if( p && ( !strcasecmp( p, ".mp4" ) || - !strcasecmp( p, ".m4v" ) ) ) + !strcasecmp( p, ".m4v" ) ) ) { - if ( h264_30 == 1 ) - mux = HB_MUX_IPOD; - else - mux = HB_MUX_MP4; + mux = HB_MUX_MP4; } else if( p && !strcasecmp(p, ".mkv" ) ) { @@ -3407,10 +3384,7 @@ static int CheckOptions( int argc, char ** argv ) else if( !strcasecmp( format, "mp4" ) || !strcasecmp( format, "m4v" ) ) { - if ( h264_30 == 1) - mux = HB_MUX_IPOD; - else - mux = HB_MUX_MP4; + mux = HB_MUX_MP4; } else if( !strcasecmp( format, "mkv" ) ) { |