summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-12-05 16:49:11 +0000
committerjstebbins <[email protected]>2014-12-05 16:49:11 +0000
commit08bcbdd649590f18f4909a613d7faffabc2e2009 (patch)
treea4a434e63cb10144367d6157cbed4b609d36a222 /libhb
parentc8ba2592e8093444f44ce38123f2c023d71f01fc (diff)
sync: fix dropping of subtitles caused by my previous commit
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6588 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/sync.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libhb/sync.c b/libhb/sync.c
index 17d0280e8..575e079ae 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -374,6 +374,10 @@ static hb_buffer_t * mergeSubtitles(subtitle_sanitizer_t *sanitizer, int end)
hb_buffer_t *tmp = a;
a->next = b->next;
b->next = a;
+ if (sanitizer->last == b)
+ {
+ sanitizer->last = a;
+ }
a = b;
b = tmp;
sanitizer->list_current = a;