add support for Nero vobsubs in mp4

Note that these do not work with any apple products that I know of.  Perian
might be able to do something with them.  MPlayer and VLC both grok nero
vobsubs.

libhb, cli, and lingui updated.


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

2 files changed, 2 insertions, 40 deletions

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 94fa5b0fa..e7265ef87 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -3893,23 +3893,6 @@ ghb_validate_subtitles(signal_user_data_t *ud)
 		{
 			one_burned = TRUE;
 		}
-		if (!burned && mux == HB_MUX_MP4 && source == VOBSUB)
-		{
-			// MP4 can only handle burned vobsubs.  make sure there isn't
-			// already something burned in the list
-			message = g_strdup_printf(
-			"Your chosen container does not support soft bitmap subtitles.\n\n"
-				"You should change your subtitle selections.\n"
-				"If you continue, some subtitles will be lost.");
-			if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, 
-				"Cancel", "Continue"))
-			{
-				g_free(message);
-				return FALSE;
-			}
-			g_free(message);
-			break;
-		}
 		if (source == SRTSUB)
 		{
 			gchar *filename;
@@ -4621,15 +4604,10 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
 		subtitle = ghb_settings_get_int(ssettings, "SubtitleTrack");
 		if (subtitle == -1)
 		{
-			if (!burned && job->mux == HB_MUX_MKV)
+			if (!burned)
 			{
 				job->select_subtitle_config.dest = PASSTHRUSUB;
 			}
-			else if (!burned && job->mux == HB_MUX_MP4)
-			{
-				// Skip any non-burned vobsubs when output is mp4
-				continue;
-			}
 			else if (burned)
 			{
 				// Only allow one subtitle to be burned into the video
@@ -4652,17 +4630,10 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
 			if (subt != NULL)
 			{
 				sub_config = subt->config;
-				if (!burned && job->mux == HB_MUX_MKV && 
-					subt->format == PICTURESUB)
+				if (!burned && subt->format == PICTURESUB)
 				{
 					sub_config.dest = PASSTHRUSUB;
 				}
-				else if (!burned && job->mux == HB_MUX_MP4 && 
-					subt->format == PICTURESUB)
-				{
-					// Skip any non-burned vobsubs when output is mp4
-					continue;
-				}
 				else if ( burned && subt->format == PICTURESUB )
 				{
 					// Only allow one subtitle to be burned into the video
diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index b74eb27ea..1c5b42cd1 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -41,15 +41,6 @@ free_subtitle_key(gpointer data)
 static gboolean
 mustBurn(signal_user_data_t *ud, GValue *settings)
 {
-	if (ghb_settings_combo_int(ud->settings, "FileFormat") == HB_MUX_MP4)
-	{
-		// MP4 can only handle burned vobsubs.  make sure there isn't
-		// already something burned in the list
-		if (ghb_settings_get_int(settings, "SubtitleSource") == VOBSUB)
-		{
-			return TRUE;
-		}
-	}
 	return FALSE;
 }