OSDN Git Service

LinGui: remove automatic m4v extension substitution
authorjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Sat, 29 Jan 2011 21:48:01 +0000 (21:48 +0000)
committerjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Sat, 29 Jan 2011 21:48:01 +0000 (21:48 +0000)
Preference option now forces either mp4 or m4v.

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

gtk/src/callbacks.c

index 3bc6c0d..939a161 100644 (file)
@@ -535,19 +535,12 @@ get_extension(signal_user_data_t *ud)
 {
        int container;
        const gchar *extension = "error";
-       GValue *audio_list;
-       GValue *subtitle_list;
 
        container = ghb_settings_combo_int(ud->settings, "FileFormat");
        if (container == HB_MUX_MP4)
        {
                extension = "mp4";
-               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-               subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
-               if (ghb_ac3_in_audio_list(audio_list) ||
-                       ghb_soft_in_subtitle_list(subtitle_list) ||
-                       ghb_settings_get_boolean(ud->settings, "ChapterMarkers") ||
-                       ghb_settings_get_boolean(ud->settings, "UseM4v"))
+               if (ghb_settings_get_boolean(ud->settings, "UseM4v"))
                {
                        extension = "m4v";
                }