Add mpeg-2 encoding support to libhb, cli, and lingui

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3853 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 15 insertions, 10 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 4ba8cdd8b..a2854dcad 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -4618,7 +4618,8 @@ format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 			}
 		} break;
 
-		case HB_VCODEC_FFMPEG:
+		case HB_VCODEC_FFMPEG_MPEG4:
+		case HB_VCODEC_FFMPEG_MPEG2:
 		{
 			return g_strdup_printf("QP: %d", (int)val);
 		} break;
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 98675dd05..6284e52fd 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -3545,7 +3545,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                               <object class="GtkLabel" id="label75">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current FFMpeg MPEG-4 Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
+                                <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current FFMpeg Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
                             </child>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index fbcd4a679..b4ff3e8d2 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -239,7 +239,8 @@ combo_opts_t denoise_opts =
 static options_map_t d_vcodec_opts[] =
 {
 	{"H.264 (x264)",    "x264",   HB_VCODEC_X264, ""},
-	{"MPEG-4 (FFmpeg)", "ffmpeg", HB_VCODEC_FFMPEG, ""},
+	{"MPEG-4 (FFmpeg)", "ffmpeg", HB_VCODEC_FFMPEG_MPEG4, ""},
+	{"MPEG-2 (FFmpeg)", "ffmpeg2",HB_VCODEC_FFMPEG_MPEG2, ""},
 	{"VP3 (Theora)",    "theora", HB_VCODEC_THEORA, ""},
 };
 combo_opts_t vcodec_opts =
@@ -736,7 +737,8 @@ ghb_vquality_range(
 			*inverted = TRUE;
 		} break;
 
-		case HB_VCODEC_FFMPEG:
+		case HB_VCODEC_FFMPEG_MPEG2:
+		case HB_VCODEC_FFMPEG_MPEG4:
 		{
 			*min = 1;
 			*max = 31;
@@ -2854,7 +2856,8 @@ ghb_build_advanced_opts_string(GValue *settings)
 			}
 		} break;
 
-		case HB_VCODEC_FFMPEG:
+		case HB_VCODEC_FFMPEG_MPEG2:
+		case HB_VCODEC_FFMPEG_MPEG4:
 		{
 			gchar *opts = ghb_settings_get_string(settings, "lavcOption");
 			if (opts != NULL)
@@ -4014,7 +4017,7 @@ ghb_validate_video(signal_user_data_t *ud)
 			return FALSE;
 		}
 		g_free(message);
-		vcodec = HB_VCODEC_FFMPEG;
+		vcodec = HB_VCODEC_FFMPEG_MPEG4;
 		ghb_ui_update(ud, "VideoEncoder", ghb_int64_value(vcodec));
 	}
 	return TRUE;
@@ -4339,7 +4342,8 @@ ghb_validate_vquality(GValue *settings)
 				max = 30;
 			} break;
 
-			case HB_VCODEC_FFMPEG:
+			case HB_VCODEC_FFMPEG_MPEG2:
+			case HB_VCODEC_FFMPEG_MPEG4:
 			{
 				min = 1;
 				max = 8;
@@ -4620,7 +4624,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
 	if ((job->mux == HB_MUX_MP4 ) && (job->vcodec == HB_VCODEC_THEORA))
 	{
 		// mp4/theora combination is not supported.
-		job->vcodec = HB_VCODEC_FFMPEG;
+		job->vcodec = HB_VCODEC_FFMPEG_MPEG4;
 	}
 	if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
 	{
@@ -4880,7 +4884,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
 					extra_opts = g_strdup_printf("%s:weightb=0", turbo_x264_opts);
 				}
 			}
-			else if (job->vcodec == HB_VCODEC_FFMPEG)
+			else if (job->vcodec == HB_VCODEC_FFMPEG_MPEG4)
 			{
 				extra_opts = g_strdup_printf("%s", turbo_lavc_opts);
 			}
diff --git a/gtk/src/makedeps.py b/gtk/src/makedeps.py
index fd8db094a..2164ab4e7 100644
--- a/gtk/src/makedeps.py
+++ b/gtk/src/makedeps.py
@@ -47,7 +47,7 @@ dep_map = (
 	DepEntry("PictureAutoCrop", "PictureLeftCrop", "FALSE", False, False),
 	DepEntry("PictureAutoCrop", "PictureRightCrop", "FALSE", False, False),
 	DepEntry("VideoEncoder", "x264_tab", "x264", False, True),
-	DepEntry("VideoEncoder", "lavc_mpeg4_tab", "ffmpeg", False, True),
+	DepEntry("VideoEncoder", "lavc_mpeg4_tab", "ffmpeg|ffmpeg2", False, True),
 	DepEntry("VideoEncoder", "Mp4iPodCompatible", "x264", False, False),
 	DepEntry("AudioEncoderActual", "AudioBitrate", "ac3pass|dtspass", True, False),
 	DepEntry("AudioEncoderActual", "AudioSamplerate", "ac3pass|dtspass", True, False),