videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

fftools/ffmpeg_dec: simplify process_subtitle() 

Its got_output argument always points to 1.
This commit is contained in:
Anton Khirnov 2023-06-02 16:41:51 +02:00
parent e9eb44ed88
commit df81fb46ee
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.c
View File

@ -731,7 +731,6 @@ cleanup:
static int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts) static int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts)
{ {
int ret = AVERROR_BUG; int ret = AVERROR_BUG;
int got_output = 1;
AVSubtitle *prev_subtitle = &ist->prev_sub.subtitle; AVSubtitle *prev_subtitle = &ist->prev_sub.subtitle;
AVSubtitle subtitle; AVSubtitle subtitle;
@ -744,7 +743,7 @@ static int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts)
subtitle.pts = signal_pts; subtitle.pts = signal_pts;
return process_subtitle(ist, &subtitle, &got_output); return process_subtitle(ist, &subtitle);
} }
int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt) int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt)

2
fftools/ffmpeg.h
View File

@ -884,7 +884,7 @@ OutputStream *ost_iter(OutputStream *prev);
void close_output_stream(OutputStream *ost); void close_output_stream(OutputStream *ost);
int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt); int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt);
int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_output); int process_subtitle(InputStream *ist, AVSubtitle *subtitle);
void update_benchmark(const char *fmt, ...); void update_benchmark(const char *fmt, ...);
/** /**

9
fftools/ffmpeg_dec.c
View File

@ -328,8 +328,9 @@ static void sub2video_flush(InputStream *ist)
} }
} }
int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_output) int process_subtitle(InputStream *ist, AVSubtitle *subtitle)
{ {
int got_output = 1;
int ret = 0; int ret = 0;
if (ist->fix_sub_duration) { if (ist->fix_sub_duration) {
@ -345,13 +346,13 @@ int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_output)
ist->prev_sub.subtitle.end_display_time = end; ist->prev_sub.subtitle.end_display_time = end;
} }
} }
FFSWAP(int, *got_output, ist->prev_sub.got_output); FFSWAP(int, got_output, ist->prev_sub.got_output);
FFSWAP(AVSubtitle, *subtitle, ist->prev_sub.subtitle); FFSWAP(AVSubtitle, *subtitle, ist->prev_sub.subtitle);
if (end <= 0) if (end <= 0)
goto out; goto out;
} }
if (!*got_output) if (!got_output)
return 0; return 0;
for (int i = 0; i < ist->nb_filters; i++) { for (int i = 0; i < ist->nb_filters; i++) {
@ -402,7 +403,7 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt)
ist->frames_decoded++; ist->frames_decoded++;
return process_subtitle(ist, &subtitle, &got_output); return process_subtitle(ist, &subtitle);
} }
static int send_filter_eof(InputStream *ist) static int send_filter_eof(InputStream *ist)