har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: do not pass possibly undefined subtitles to sub2video_update

Browse Source 
It should not matter for real-life usage, it is just cleaner this way.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Nicolas George <george@nsup.org>
This commit is contained in:
Marton Balint 2013-11-23 17:25:46 +01:00
parent 58010e57b2
commit 3e396ca8ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -1822,9 +1822,12 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
FFSWAP(AVSubtitle, subtitle, ist->prev_sub.subtitle); FFSWAP(AVSubtitle, subtitle, ist->prev_sub.subtitle);
} }
if (!*got_output)
return ret;
sub2video_update(ist, &subtitle); sub2video_update(ist, &subtitle);
if (!*got_output || !subtitle.num_rects) if (!subtitle.num_rects)
return ret; return ret;
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {