summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/xvidcore/A00-libtool.patch12
-rw-r--r--contrib/xvidcore/P00-darwin.patch31
-rw-r--r--contrib/xvidcore/P01-cygwin.patch17
-rw-r--r--contrib/xvidcore/module.defs28
-rw-r--r--contrib/xvidcore/module.rules2
-rw-r--r--libhb/common.h6
-rw-r--r--libhb/encxvid.c242
-rw-r--r--libhb/hb.c2
-rw-r--r--libhb/internal.h1
-rw-r--r--libhb/module.defs4
-rw-r--r--libhb/muxavi.c4
-rw-r--r--libhb/muxmkv.c1
-rw-r--r--libhb/muxogm.c7
-rw-r--r--libhb/work.c7
-rw-r--r--macosx/Controller.mm5
-rw-r--r--macosx/HandBrake.xcodeproj/project.pbxproj20
-rw-r--r--make/include/main.defs1
-rw-r--r--test/module.defs2
-rw-r--r--test/test.c8
19 files changed, 9 insertions, 391 deletions
diff --git a/contrib/xvidcore/A00-libtool.patch b/contrib/xvidcore/A00-libtool.patch
deleted file mode 100644
index 0ae50dbbb..000000000
--- a/contrib/xvidcore/A00-libtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurw xvidcore-20090311.orig/build/generic/bootstrap.sh xvidcore-20090311/build/generic/bootstrap.sh
---- xvidcore-20090311.orig/build/generic/bootstrap.sh 2005-05-23 05:29:43.000000000 -0400
-+++ xvidcore-20090311/build/generic/bootstrap.sh 2009-04-15 13:13:54.000000000 -0400
-@@ -75,7 +75,7 @@
- $AUTOMAKE -c -a 1>/dev/null 2>&1
-
- echo "Copying files provided by libtool"
--$LIBTOOLIZE -f -c 1>/dev/null 2>&1
-+$LIBTOOLIZE -f -c -i 1>/dev/null 2>&1
-
- echo "Removing files that are not needed"
- rm -rf autom4* 1>/dev/null 2>&1
diff --git a/contrib/xvidcore/P00-darwin.patch b/contrib/xvidcore/P00-darwin.patch
deleted file mode 100644
index 12bc8dac0..000000000
--- a/contrib/xvidcore/P00-darwin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur xvidcore-20090311.orig/build/generic/configure.in xvidcore-20090311/build/generic/configure.in
---- xvidcore-20090311.orig/build/generic/configure.in 2008-12-05 05:18:52.000000000 -0500
-+++ xvidcore-20090311/build/generic/configure.in 2009-04-14 11:30:04.000000000 -0400
-@@ -427,8 +427,13 @@
- MARK_FUNCS=""
- ;;
- *darwin*)
-- AC_MSG_RESULT([macho])
-- NASM_FORMAT="macho"
-+ if test "$ARCHITECTURE" = "X86_64" ; then
-+ AC_MSG_RESULT([macho64])
-+ NASM_FORMAT="macho64"
-+ else
-+ AC_MSG_RESULT([macho])
-+ NASM_FORMAT="macho"
-+ fi
- PREFIX="-DPREFIX"
- MARK_FUNCS=""
- ;;
-diff -Naur xvidcore-20090311.orig/src/nasm.inc xvidcore-20090311/src/nasm.inc
---- xvidcore-20090311.orig/src/nasm.inc 2008-12-05 05:15:02.000000000 -0500
-+++ xvidcore-20090311/src/nasm.inc 2009-04-14 12:13:37.000000000 -0400
-@@ -177,6 +177,8 @@
- %macro TEXT 0
- %ifidn __OUTPUT_FORMAT__,macho
- SECTION .text align=SECTION_ALIGN
-+%elifidn __OUTPUT_FORMAT__,macho64
-+ SECTION .text align=SECTION_ALIGN
- %else
- SECTION .rotext align=SECTION_ALIGN
- %endif
diff --git a/contrib/xvidcore/P01-cygwin.patch b/contrib/xvidcore/P01-cygwin.patch
deleted file mode 100644
index 20afce260..000000000
--- a/contrib/xvidcore/P01-cygwin.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur xvidcore-20090311.orig/build/generic/configure.in xvidcore-20090311/build/generic/configure.in
---- xvidcore-20090311.orig/build/generic/configure.in 2008-12-05 05:18:52.000000000 -0500
-+++ xvidcore-20090311/build/generic/configure.in 2009-04-14 13:18:23.034051500 -0400
-@@ -282,10 +282,9 @@
- ;;
- [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
- AC_MSG_RESULT([ok])
-- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
-- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
-- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\[email protected] libxvidcore.def"
-- SPECIFIC_CFLAGS="-mno-cygwin"
-+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
-+ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\[email protected] libxvidcore.def"
- ;;
- darwin*|raphsody*)
- STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs
deleted file mode 100644
index 5a76e0911..000000000
--- a/contrib/xvidcore/module.defs
+++ /dev/null
@@ -1,28 +0,0 @@
-$(eval $(call import.MODULE.defs,XVIDCORE,xvidcore))
-$(eval $(call import.CONTRIB.defs,XVIDCORE))
-
-XVIDCORE.FETCH.url = http://download.m0k.org/handbrake/contrib/xvidcore-20090311.tar.gz
-
-XVIDCORE.CONFIGURE.static =
-XVIDCORE.CONFIGURE.shared =
-XVIDCORE.CONFIGURE.deps =
-XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
-XVIDCORE.CONFIGURE.bootstrap = ./bootstrap.sh;
-
-XVIDCORE.BUILD.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
-XVIDCORE.BUILD.extra = STATIC_LIB=libxvidcore.a
-XVIDCORE.BUILD.ntargets = libxvidcore.a
-
-XVIDCORE.CLEAN.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
-
-define XVIDCORE.INSTALL
- $(CP.exe) $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
- $(CP.exe) $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
- $(TOUCH.exe) $@
-endef
-
-define XVIDCORE.UNINSTALL
- $(RM.exe) -f $(CONTRIB.build/)lib/libxvidcore.a
- $(RM.exe) -f $(CONTRIB.build/)include/xvid.h
- $(RM.exe) -f $(XVIDCORE.INSTALL.target)
-endef
diff --git a/contrib/xvidcore/module.rules b/contrib/xvidcore/module.rules
deleted file mode 100644
index 76600608e..000000000
--- a/contrib/xvidcore/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,XVIDCORE))
-$(eval $(call import.CONTRIB.rules,XVIDCORE))
diff --git a/libhb/common.h b/libhb/common.h
index d7649f4c9..83460653a 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -191,9 +191,8 @@ struct hb_job_s
areBframes: boolean to note if b-frames are included in x264opts */
#define HB_VCODEC_MASK 0x0000FF
#define HB_VCODEC_FFMPEG 0x000001
-#define HB_VCODEC_XVID 0x000002
-#define HB_VCODEC_X264 0x000004
-#define HB_VCODEC_THEORA 0x000008
+#define HB_VCODEC_X264 0x000002
+#define HB_VCODEC_THEORA 0x000004
int vcodec;
float vquality;
@@ -663,7 +662,6 @@ extern hb_work_object_t hb_encvobsub;
extern hb_work_object_t hb_deccc608;
extern hb_work_object_t hb_render;
extern hb_work_object_t hb_encavcodec;
-extern hb_work_object_t hb_encxvid;
extern hb_work_object_t hb_encx264;
extern hb_work_object_t hb_enctheora;
extern hb_work_object_t hb_deca52;
diff --git a/libhb/encxvid.c b/libhb/encxvid.c
deleted file mode 100644
index 843d12adf..000000000
--- a/libhb/encxvid.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* $Id: encxvid.c,v 1.10 2005/03/09 23:28:39 titer Exp $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#include "hb.h"
-
-#include "xvid.h"
-
-int encxvidInit( hb_work_object_t *, hb_job_t * );
-int encxvidWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-void encxvidClose( hb_work_object_t * );
-
-hb_work_object_t hb_encxvid =
-{
- WORK_ENCXVID,
- "MPEG-4 encoder (libxvidcore)",
- encxvidInit,
- encxvidWork,
- encxvidClose
-};
-
-struct hb_work_private_s
-{
- hb_job_t * job;
- void * xvid;
- char filename[1024];
- int quant;
- int configDone;
-};
-
-int encxvidInit( hb_work_object_t * w, hb_job_t * job )
-{
- xvid_gbl_init_t xvid_gbl_init;
- xvid_enc_create_t create;
- xvid_plugin_single_t single;
- xvid_plugin_2pass1_t rc2pass1;
- xvid_plugin_2pass2_t rc2pass2;
- xvid_enc_plugin_t plugins[1];
-
- hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
- w->private_data = pv;
-
- pv->job = job;
-
- memset( pv->filename, 0, 1024 );
- hb_get_tempory_filename( job->h, pv->filename, "xvid.log" );
-
- memset( &xvid_gbl_init, 0, sizeof( xvid_gbl_init ) );
- xvid_gbl_init.version = XVID_VERSION;
- xvid_global( NULL, XVID_GBL_INIT, &xvid_gbl_init, NULL );
-
- memset( &create, 0, sizeof( create ) );
- create.version = XVID_VERSION;
- create.width = job->width;
- create.height = job->height;
- create.zones = NULL;
- create.num_zones = 0;
-
- switch( job->pass )
- {
- case 0:
- memset( &single, 0, sizeof( single ) );
- single.version = XVID_VERSION;
- if( job->vquality < 0.0 )
- {
- /* Rate control */
- single.bitrate = 1000 * job->vbitrate;
- pv->quant = 0;
- }
- else
- {
- if( job->vquality > 0 && job->vquality < 1 )
- {
- /* Constant quantizer */
- pv->quant = 31 - job->vquality * 30;
- }
- else
- {
- pv->quant = job->vquality;
- }
-
- hb_log( "encxvid: encoding at constant quantizer %d",
- pv->quant );
- }
- plugins[0].func = xvid_plugin_single;
- plugins[0].param = &single;
- break;
-
- case 1:
- memset( &rc2pass1, 0, sizeof( rc2pass1 ) );
- rc2pass1.version = XVID_VERSION;
- rc2pass1.filename = pv->filename;
- plugins[0].func = xvid_plugin_2pass1;
- plugins[0].param = &rc2pass1;
- break;
-
- case 2:
- memset( &rc2pass2, 0, sizeof( rc2pass2 ) );
- rc2pass2.version = XVID_VERSION;
- rc2pass2.filename = pv->filename;
- rc2pass2.bitrate = 1000 * job->vbitrate;
- plugins[0].func = xvid_plugin_2pass2;
- plugins[0].param = &rc2pass2;
- break;
- }
-
- create.plugins = plugins;
- create.num_plugins = 1;
-
- create.num_threads = 0;
- create.fincr = job->vrate_base;
- create.fbase = job->vrate;
- create.max_key_interval = 10 * job->vrate / job->vrate_base;
- create.max_bframes = 0;
- create.bquant_ratio = 150;
- create.bquant_offset = 100;
- create.frame_drop_ratio = 0;
- create.global = 0;
-
- xvid_encore( NULL, XVID_ENC_CREATE, &create, NULL );
- pv->xvid = create.handle;
-
- return 0;
-}
-
-/***********************************************************************
- * Close
- ***********************************************************************
- *
- **********************************************************************/
-void encxvidClose( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
-
- if( pv->xvid )
- {
- hb_deep_log( 2, "encxvid: closing libxvidcore" );
- xvid_encore( pv->xvid, XVID_ENC_DESTROY, NULL, NULL);
- }
-
- free( pv );
- w->private_data = NULL;
-}
-
-/***********************************************************************
- * Work
- ***********************************************************************
- *
- **********************************************************************/
-int encxvidWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_job_t * job = pv->job;
- xvid_enc_frame_t frame;
- hb_buffer_t * in = *buf_in, * buf;
-
- if ( in->size <= 0 )
- {
- /* EOF on input - send it downstream & say we're done */
- *buf_out = in;
- *buf_in = NULL;
- return HB_WORK_DONE;
- }
-
- /* Should be way too large */
- buf = hb_video_buffer_init( job->width, job->height );
- buf->start = in->start;
- buf->stop = in->stop;
-
- memset( &frame, 0, sizeof( frame ) );
-
- frame.version = XVID_VERSION;
- frame.bitstream = buf->data;
- frame.length = -1;
- frame.input.plane[0] = in->data;
- frame.input.csp = XVID_CSP_I420;
- frame.input.stride[0] = job->width;
- frame.vol_flags = 0;
- frame.vop_flags = XVID_VOP_HALFPEL | XVID_VOP_INTER4V |
- XVID_VOP_TRELLISQUANT | XVID_VOP_HQACPRED;
- if( job->anamorphic.mode )
- {
- frame.par = XVID_PAR_EXT;
- frame.par_width = job->anamorphic.par_width;
- frame.par_height = job->anamorphic.par_height;
- }
-
- if( job->grayscale )
- {
- frame.vop_flags |= XVID_VOP_GREYSCALE;
- }
- frame.type = XVID_TYPE_AUTO;
- frame.quant = pv->quant;
- frame.motion = XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
- XVID_ME_EXTSEARCH16 | XVID_ME_ADVANCEDDIAMOND8 |
- XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH8 |
- XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP;
- frame.quant_intra_matrix = NULL;
- frame.quant_inter_matrix = NULL;
-
- buf->size = xvid_encore( pv->xvid, XVID_ENC_ENCODE, &frame, NULL );
- buf->frametype = ( frame.out_flags & XVID_KEYFRAME ) ? HB_FRAME_KEY : HB_FRAME_REF;
-
- if( !pv->configDone )
- {
- int vol_start, vop_start;
- for( vol_start = 0; ; vol_start++ )
- {
- if( buf->data[vol_start] == 0x0 &&
- buf->data[vol_start+1] == 0x0 &&
- buf->data[vol_start+2] == 0x1 &&
- buf->data[vol_start+3] == 0x20 )
- {
- break;
- }
- }
- for( vop_start = vol_start + 4; ; vop_start++ )
- {
- if( buf->data[vop_start] == 0x0 &&
- buf->data[vop_start+1] == 0x0 &&
- buf->data[vop_start+2] == 0x1 &&
- buf->data[vop_start+3] == 0xB6 )
- {
- break;
- }
- }
-
- hb_deep_log( 2, "encxvid: VOL size is %d bytes", vop_start - vol_start );
- job->config.mpeg4.length = vop_start - vol_start;
- memcpy( job->config.mpeg4.bytes, &buf->data[vol_start],
- job->config.mpeg4.length );
- pv->configDone = 1;
- }
-
- *buf_out = buf;
-
- return HB_WORK_OK;
-}
-
diff --git a/libhb/hb.c b/libhb/hb.c
index 4f484208d..c4045170c 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -157,7 +157,6 @@ hb_handle_t * hb_init( int verbose, int update_check )
hb_register( &hb_deccc608 );
hb_register( &hb_render );
hb_register( &hb_encavcodec );
- hb_register( &hb_encxvid );
hb_register( &hb_encx264 );
hb_register( &hb_enctheora );
hb_register( &hb_deca52 );
@@ -254,7 +253,6 @@ hb_handle_t * hb_init_dl( int verbose, int update_check )
hb_register( &hb_deccc608 );
hb_register( &hb_render );
hb_register( &hb_encavcodec );
- hb_register( &hb_encxvid );
hb_register( &hb_encx264 );
hb_register( &hb_enctheora );
hb_register( &hb_deca52 );
diff --git a/libhb/internal.h b/libhb/internal.h
index 1e5afdc1f..397883d3c 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -259,7 +259,6 @@ enum
WORK_ENCVOBSUB,
WORK_RENDER,
WORK_ENCAVCODEC,
- WORK_ENCXVID,
WORK_ENCX264,
WORK_ENCTHEORA,
WORK_DECA52,
diff --git a/libhb/module.defs b/libhb/module.defs
index 17efc31ff..c79e70bfb 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,6 +1,6 @@
__deps__ := A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA \
LIBDVDREAD LIBDVDNAV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS \
- MP4V2 MPEG2DEC PTHREADW32 X264 XVIDCORE ZLIB
+ MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
$(eval $(call import.GCC,LIBHB))
@@ -89,7 +89,7 @@ LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
a52 bz2 avcodec avformat avutil dca dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \
- ogg pthreadGC2 samplerate swscale theora vorbis vorbisenc x264 xvidcore z, \
+ ogg pthreadGC2 samplerate swscale theora vorbis vorbisenc x264 z, \
$(CONTRIB.build/)lib/lib$(n).a )
LIBHB.GCC.args.extra.dylib++ = -Wl,--out-implib,$(LIBHB.lib)
diff --git a/libhb/muxavi.c b/libhb/muxavi.c
index 4838ee133..85839e1ee 100644
--- a/libhb/muxavi.c
+++ b/libhb/muxavi.c
@@ -367,8 +367,6 @@ static int AVIInit( hb_mux_object_t * m )
if( job->vcodec == HB_VCODEC_FFMPEG )
h.Handler = FOURCC( "divx" );
- else if( job->vcodec == HB_VCODEC_XVID )
- h.Handler = FOURCC( "xvid" );
else if( job->vcodec == HB_VCODEC_X264 )
h.Handler = FOURCC( "h264" );
@@ -387,8 +385,6 @@ static int AVIInit( hb_mux_object_t * m )
f.BitCount = 24;
if( job->vcodec == HB_VCODEC_FFMPEG )
f.Compression = FOURCC( "DX50" );
- else if( job->vcodec == HB_VCODEC_XVID )
- f.Compression = FOURCC( "XVID" );
else if( job->vcodec == HB_VCODEC_X264 )
f.Compression = FOURCC( "H264" );
#undef f
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 6a8a55cbe..3f5e9637d 100644
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -124,7 +124,6 @@ static int MKVInit( hb_mux_object_t * m )
if (job->areBframes)
track->minCache = 1;
break;
- case HB_VCODEC_XVID:
case HB_VCODEC_FFMPEG:
track->codecID = MK_VCODEC_MP4ASP;
track->codecPrivate = job->config.mpeg4.bytes;
diff --git a/libhb/muxogm.c b/libhb/muxogm.c
index ccb10517a..885dcca95 100644
--- a/libhb/muxogm.c
+++ b/libhb/muxogm.c
@@ -153,7 +153,6 @@ static int OGMInit( hb_mux_object_t * m )
op.packet = job->config.theora.headers[0] + sizeof(op);
ogg_stream_packetin( &mux_data->os, &op );
break;
- case HB_VCODEC_XVID:
case HB_VCODEC_X264:
case HB_VCODEC_FFMPEG:
{
@@ -164,10 +163,6 @@ static int OGMInit( hb_mux_object_t * m )
{
memcpy( h.sub_type, "H264", 4 );
}
- else if( mux_data->codec == HB_VCODEC_XVID )
- {
- memcpy( h.sub_type, "XVID", 4 );
- }
else
{
memcpy( h.sub_type, "DX50", 4 );
@@ -262,7 +257,6 @@ static int OGMInit( hb_mux_object_t * m )
OGMFlush( m, mux_data );
}
break;
- case HB_VCODEC_XVID:
case HB_VCODEC_X264:
case HB_VCODEC_FFMPEG:
break;
@@ -310,7 +304,6 @@ static int OGMMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
memcpy( op.packet, buf->data + sizeof( ogg_packet ), op.bytes );
break;
case HB_VCODEC_FFMPEG:
- case HB_VCODEC_XVID:
case HB_VCODEC_X264:
op.bytes = buf->size + 1;
op.packet = malloc( op.bytes );
diff --git a/libhb/work.c b/libhb/work.c
index 21232debf..848c798e4 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -244,10 +244,6 @@ void hb_display_job_info( hb_job_t * job )
hb_log( " + encoder: FFmpeg" );
break;
- case HB_VCODEC_XVID:
- hb_log( " + encoder: XviD" );
- break;
-
case HB_VCODEC_X264:
hb_log( " + encoder: x264" );
if( job->x264opts != NULL && *job->x264opts != '\0' )
@@ -456,9 +452,6 @@ static void do_job( hb_job_t * job, int cpu_count )
case HB_VCODEC_FFMPEG:
w = hb_get_work( WORK_ENCAVCODEC );
break;
- case HB_VCODEC_XVID:
- w = hb_get_work( WORK_ENCXVID );
- break;
case HB_VCODEC_X264:
w = hb_get_work( WORK_ENCX264 );
break;
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 9e58356ac..339945b83 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -395,7 +395,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
/* Video encoder */
[fVidEncoderPopUp removeAllItems];
[fVidEncoderPopUp addItemWithTitle: @"FFmpeg"];
- [fVidEncoderPopUp addItemWithTitle: @"XviD"];
@@ -4200,8 +4199,8 @@ the user is using "Custom" settings by determining the sender*/
qpRFLabelString = @"RF:";
}
}
- /* ffmpeg and xvid 1-31 */
- if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_FFMPEG || [[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_XVID)
+ /* ffmpeg 1-31 */
+ if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_FFMPEG )
{
[fVidQualitySlider setMinValue:1.0];
[fVidQualitySlider setMaxValue:31.0];
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index fefcd4a56..1ecd536a2 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -711,7 +711,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -742,7 +741,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -808,7 +806,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -845,7 +842,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -932,7 +928,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -969,7 +964,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -1056,7 +1050,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -1093,7 +1086,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -1180,7 +1172,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -1217,7 +1208,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -1307,7 +1297,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -1344,7 +1333,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -1434,7 +1422,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -1471,7 +1458,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -1561,7 +1547,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -1598,7 +1583,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -1688,7 +1672,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -1725,7 +1708,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrakeCLI;
};
@@ -1824,7 +1806,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
@@ -1866,7 +1847,6 @@
"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
- "$(EXTERNAL_BUILD)/contrib/lib/libxvidcore.a",
);
PRODUCT_NAME = HandBrake;
WARNING_CFLAGS = (
diff --git a/make/include/main.defs b/make/include/main.defs
index 42268549d..0e44c97c3 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -34,7 +34,6 @@ ifneq (,$(filter $(BUILD.system),mingw))
endif
MODULES += contrib/x264
-MODULES += contrib/xvidcore
ifneq (,$(filter $(BUILD.system),cygwin mingw))
MODULES += contrib/zlib
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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 03:16:45 +0000