From: jstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Mon, 6 Apr 2009 15:50:36 +0000 (+0000)
Subject: LinGui: Say ba-bye to avi & ogm & xvid
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e820219e66e141c420f5b1aa4f5344f922036ea0;hp=6d3c3970b690f76a853f496244982cf93ff66511;p=handbrake-jp%2Fhandbrake-jp-git.git

LinGui: Say ba-bye to avi & ogm & xvid

git-svn-id: svn://localhost/HandBrake/trunk@2310 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 9a298227..97fcd04f 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -93,8 +93,6 @@ static options_map_t d_container_opts[] =
 	{"MKV", "mkv", HB_MUX_MKV, "mkv"},
 	{"MP4", "mp4", HB_MUX_MP4, "mp4"},
 	{"M4V", "m4v", HB_MUX_MP4, "m4v"},
-	{"AVI", "avi", HB_MUX_AVI, "avi"},
-	{"OGM", "ogm", HB_MUX_OGM, "ogm"},
 };
 combo_opts_t container_opts =
 {
@@ -157,7 +155,6 @@ combo_opts_t denoise_opts =
 static options_map_t d_vcodec_opts[] =
 {
 	{"H.264 (x264)",    "x264",   HB_VCODEC_X264, ""},
-	{"MPEG-4 (XviD)",   "xvid",   HB_VCODEC_XVID, ""},
 	{"MPEG-4 (FFMPEG)", "ffmpeg", HB_VCODEC_FFMPEG, ""},
 	{"Theora",          "theora", HB_VCODEC_THEORA, ""},
 };
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 55a9886a..507797e5 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -1691,7 +1691,7 @@ typedef struct
 static value_map_t vcodec_xlat[] =
 {
 	{"MPEG-4 (FFmpeg)", "ffmpeg"},
-	{"MPEG-4 (XviD)", "xvid"},
+	{"MPEG-4 (XviD)", "ffmpeg"},
 	{"H.264 (x264)", "x264"},
 	{"VP3 (Theora)", "theora"},
 	{NULL,NULL}
@@ -1711,8 +1711,8 @@ value_map_t container_xlat[] =
 	{"MP4 file", "mp4"},
 	{"M4V file", "m4v"},
 	{"MKV file", "mkv"},
-	{"AVI file", "avi"},
-	{"OGM file", "ogm"},
+	{"AVI file", "mkv"},
+	{"OGM file", "mkv"},
 	{NULL, NULL}
 };