summaryrefslogtreecommitdiffstats
path: root/libhb/common.h
diff options
context:
space:
mode:
authorjbrjake <[email protected]>2009-05-26 15:23:21 +0000
committerjbrjake <[email protected]>2009-05-26 15:23:21 +0000
commit4106a36fa2425ab6eed7d76d0c5861691cd5df17 (patch)
treeeabd80a8e99398b8d546b766f2936f6a93cb05bb /libhb/common.h
parentfdadd571645edc4360f5cd25e3bb45c21a3e65f8 (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 'libhb/common.h')
-rw-r--r--libhb/common.h6
1 files changed, 2 insertions, 4 deletions
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;