aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-06-02 16:32:55 +0200
committerAnton Khirnov <anton@khirnov.net>2023-06-19 09:48:55 +0200
commite9eb44ed8869c340f1c4b415e91741e756e48b11 (patch)
treeb8aa44a0c70526e4958c47dc6543ff39072eb304
parent52d7ea663531ba9b6896dbb2e8f34dfd1eee3e8a (diff)
downloadffmpeg-e9eb44ed8869c340f1c4b415e91741e756e48b11.tar.gz
fftools/ffmpeg_dec: drop always-0 InputStream.prev_sub.ret
-rw-r--r--fftools/ffmpeg.h1
-rw-r--r--fftools/ffmpeg_dec.c3
2 files changed, 1 insertions, 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);