LinGui: expunge the remaining bits of xvid from the gtk gui

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

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index b435cd1..28d5c8e 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,13 +4,13 @@ if MINGW
 HB_LIBS= \
        -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
        -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-       -lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz \
+       -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
        -lbz2 -liberty -lpthreadGC2
 else
 HB_LIBS= \
        -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
        -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-       -lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz \
+       -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
        -lbz2 -lpthread
 endif
 

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 616c9c9..657d957 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -3395,7 +3395,6 @@ format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
                                return g_strdup_printf("QP: %.4g (%.0f%%)", val, percent);
                } break;
 
-               case HB_VCODEC_XVID:
                case HB_VCODEC_FFMPEG:
                {
                        percent = 100. * (30 - (val - 1)) / 30.;

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 581d2c4..e52dac0 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -5617,19 +5617,6 @@ libvorbis authors:
 libx264 authors:
   Laurent Aimar
 
-libxvidcore authors:
-  Christoph Lampert
-  Michael Militzer
-  Peter Ross
-  Benjamin Herrenschmidt
-  Daniel Smith
-  Dirk Knop
-  Edouard Gomez
-  Guillaume Morin
-  MinChen
-  Pascal Massimino
-  Radoslaw Czyz
-
 </property>
     <property name="logo_icon_name">hb-icon</property>
     <property name="wrap_license">True</property>

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index c1ce23e..a2a3050 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -607,7 +607,6 @@ ghb_vquality_range(
                        *inverted = TRUE;
                } break;
 
-               case HB_VCODEC_XVID:
                case HB_VCODEC_FFMPEG:
                {
                        *min = 1;
@@ -3366,14 +3365,14 @@ ghb_validate_video(signal_user_data_t *ud)
                message = g_strdup_printf(
                                        "Theora is not supported in the MP4 and AVI containers.\n\n"
                                        "You should choose a different video codec or container.\n"
-                                       "If you continue, XviD will be chosen for you.");
+                                       "If you continue, FFMPEG will be chosen for you.");
                if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
                {
                        g_free(message);
                        return FALSE;
                }
                g_free(message);
-               vcodec = HB_VCODEC_XVID;
+               vcodec = HB_VCODEC_FFMPEG;
                ghb_ui_update(ud, "VideoEncoder", ghb_int64_value(vcodec));
        }
        return TRUE;
@@ -3429,6 +3428,7 @@ ghb_validate_subtitles(signal_user_data_t *ud)
                                return FALSE;
                        }
                        g_free(message);
+                       break;
                }
        }
        return TRUE;
@@ -3655,7 +3655,6 @@ ghb_validate_vquality(GValue *settings)
                                max = 30;
                        } break;
 
-                       case HB_VCODEC_XVID:
                        case HB_VCODEC_FFMPEG:
                        {
                                min = 1;
@@ -3871,7 +3870,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
                (job->vcodec == HB_VCODEC_THEORA))
        {
                // mp4|avi/theora combination is not supported.
-               job->vcodec = HB_VCODEC_XVID;
+               job->vcodec = HB_VCODEC_FFMPEG;
        }
        if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
        {

diff --git a/gtk/src/preset_xlat.c b/gtk/src/preset_xlat.c
index d3fad53..990ea58 100644 (file)
--- a/gtk/src/preset_xlat.c
+++ b/gtk/src/preset_xlat.c
@@ -210,7 +210,7 @@ static value_map_t subtitle_xlat[] =
 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}

diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index fafdd7f..5d64de1 100644 (file)
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -2437,7 +2437,6 @@ import_xlat_preset(GValue *dict)
                                vquality = 51. - vquality * 51.;
                        } break;
 
-                       case HB_VCODEC_XVID:
                        case HB_VCODEC_FFMPEG:
                        {
                                vquality = 31. - vquality * 30.;

diff --git a/make/include/main.defs b/make/include/main.defs
index 0e44c97..5ad59c9 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -22,6 +22,7 @@ MODULES += contrib/libdca
 MODULES += contrib/libdvdread
 MODULES += contrib/libdvdnav
 MODULES += contrib/libmkv
+MODULES += contrib/bdtools
 MODULES += contrib/libogg
 MODULES += contrib/libsamplerate
 MODULES += contrib/libtheora