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/dec_sub.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sub/dec_sub.c') diff --git a/sub/dec_sub.c b/sub/dec_sub.c index ec9af94abb..7e4427a40f 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -121,6 +121,10 @@ static void read_sub_data(struct dec_sub *sub, struct sub_data *subdata) assert(sub_accept_packets_in_advance(sub)); char *temp = NULL; + struct sd *sd = sub_get_last_sd(sub); + + sd->no_remove_duplicates = true; + for (int i = 0; i < subdata->sub_num; i++) { subtitle *st = &subdata->subtitles[i]; // subdata is in 10 ms ticks, pts is in seconds @@ -161,7 +165,6 @@ static void read_sub_data(struct dec_sub *sub, struct sub_data *subdata) sub_decode(sub, &pkt); } - struct sd *sd = sub_get_last_sd(sub); // Hack for broken FFmpeg packet format: make sd_ass keep the subtitle // events on reset(), even though broken FFmpeg ASS packets were received // (from sd_lavc_conv.c). Normally, these events are removed on seek/reset, @@ -169,6 +172,8 @@ static void read_sub_data(struct dec_sub *sub, struct sub_data *subdata) if (sd && sd->driver->fix_events) sd->driver->fix_events(sd); + sd->no_remove_duplicates = false; + talloc_free(temp); } -- cgit v1.2.3