From 3913e3e383f2838c19c876ff1d809ac883014760 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 2 Jun 2013 22:35:00 +0200 Subject: sub: don't check for duplicates on sub conversion This mirrors commit "sub: remove check_duplicate_plaintext_event()". That code was basically duplicated. In general, this code is still needed when doing conversion during demuxing (mostly because you can seek during demuxing, which will cause duplicate events by replaying). --- sub/sd_ass.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'sub/sd_ass.c') diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 21d941933c..7e863a2844 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -132,11 +132,13 @@ static void decode(struct sd *sd, struct demux_packet *packet) return; } not_all_whitespace:; - for (int i = 0; i < track->n_events; i++) - if (track->events[i].Start == ipts - && (duration <= 0 || track->events[i].Duration == iduration) - && strcmp(track->events[i].Text, text) == 0) - return; // We've already added this subtitle + if (!sd->no_remove_duplicates) { + for (int i = 0; i < track->n_events; i++) + if (track->events[i].Start == ipts + && (duration <= 0 || track->events[i].Duration == iduration) + && strcmp(track->events[i].Text, text) == 0) + return; // We've already added this subtitle + } if (duration <= 0) { iduration = 10000; ctx->incomplete_event = true; -- cgit v1.2.3