diff options
| author | jstebbins <[email protected]> | 2009-09-30 15:34:07 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-09-30 15:34:07 +0000 |
| commit | 5a335ad33b7894306cf73588aaf71547ab088fd2 (patch) | |
| tree | 48f263f393bc0ddd90a30dc5a24ece05a76b5b65 /gtk/src/hb-backend.c | |
| parent | 6a2e47339a1dd65c4866c1d907f6b74565953e02 (diff) | |
LinGui: fix incorrect marking of CC track as forced or burned
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2855 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/hb-backend.c')
| -rw-r--r-- | gtk/src/hb-backend.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 5d1946678..5aa1f6378 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -2193,10 +2193,12 @@ ghb_find_cc_track(gint titleindex) gint ghb_find_subtitle_track( - gint titleindex, - const gchar *lang, - gint source, - GHashTable *track_indices) + gint titleindex, + const gchar * lang, + gboolean burn, + gboolean force, + gint source, + GHashTable * track_indices) { hb_list_t * list; hb_title_t * title; @@ -2241,8 +2243,9 @@ ghb_find_subtitle_track( continue; subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii ); - if ((strcmp(lang, subtitle->iso639_2) == 0) || - (strcmp(lang, "und") == 0)) + if (((burn || force) && (subtitle->source == VOBSUB)) && + ((strcmp(lang, subtitle->iso639_2) == 0) || + (strcmp(lang, "und") == 0))) { used[ii] = TRUE; return ii; |