diff options
| author | jbrjake <[email protected]> | 2009-05-26 15:23:21 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2009-05-26 15:23:21 +0000 |
| commit | 4106a36fa2425ab6eed7d76d0c5861691cd5df17 (patch) | |
| tree | eabd80a8e99398b8d546b766f2936f6a93cb05bb /test | |
| parent | fdadd571645edc4360f5cd25e3bb45c21a3e65f8 (diff) | |
Excises xvid from libhb because it's not worthy. Having two different MPEG-4 Part 2 encoders is superfluous and when choosing between ffmpeg and xvid, xvid is the clear loser since we need to keep ffmpeg around for other functions and xvid constantly requires attention to ensure it compiles.
MacGui: Removes some stray references to the codec and unlinks it from the Xcode project.
CLI: Removes references to the codec and removes it as a dependency.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2448 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
| -rw-r--r-- | test/module.defs | 2 | ||||
| -rw-r--r-- | test/test.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/test/module.defs b/test/module.defs index 9be48b418..c803fcb23 100644 --- a/test/module.defs +++ b/test/module.defs @@ -11,7 +11,7 @@ TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI) TEST.libs = $(LIBHB.a) $(foreach n, \ a52 avcodec avformat avutil dca dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \ - ogg samplerate swscale theora vorbis vorbisenc x264 xvidcore, \ + ogg samplerate swscale theora vorbis vorbisenc x264, \ $(CONTRIB.build/)lib/lib$(n).a ) TEST.install.exe = $(PREFIX/)bin/$(notdir $(TEST.exe)) diff --git a/test/test.c b/test/test.c index 3c93cecd5..ab08750e2 100644 --- a/test/test.c +++ b/test/test.c @@ -1962,8 +1962,8 @@ static void ShowHelp() "### Video Options------------------------------------------------------------\n\n" - " -e, --encoder <string> Set video library encoder (ffmpeg,xvid,\n" - " x264,theora default: ffmpeg)\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" @@ -2470,10 +2470,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; |