From e9eb44ed8869c340f1c4b415e91741e756e48b11 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 2 Jun 2023 16:32:55 +0200 Subject: [PATCH] fftools/ffmpeg_dec: drop always-0 InputStream.prev_sub.ret --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_dec.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 88e3516243..7b38812f74 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -365,7 +365,6 @@ typedef struct InputStream { int fix_sub_duration; struct { /* previous decoded subtitle and related variables */ int got_output; - int ret; AVSubtitle subtitle; } prev_sub; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 799be63215..c0c242147f 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -346,14 +346,13 @@ int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_output) } } FFSWAP(int, *got_output, ist->prev_sub.got_output); - FFSWAP(int, ret, ist->prev_sub.ret); FFSWAP(AVSubtitle, *subtitle, ist->prev_sub.subtitle); if (end <= 0) goto out; } if (!*got_output) - return ret; + return 0; for (int i = 0; i < ist->nb_filters; i++) { ret = ifilter_sub2video(ist->filters[i], subtitle);