[FFmpeg-devel] [PATCH 1/3] ffmpeg: do not pass possibly undefined subtitles to sub2video_update

Marton Balint cus at passwd.hu
Sat Nov 23 17:58:13 CET 2013


Signed-off-by: Marton Balint <cus at passwd.hu>
---
 ffmpeg.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 26cbbe3..ff39fe0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1816,9 +1816,12 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
         FFSWAP(AVSubtitle, subtitle,    ist->prev_sub.subtitle);
     }
 
+    if (!*got_output)
+        return ret;
+
     sub2video_update(ist, &subtitle);
 
-    if (!*got_output || !subtitle.num_rects)
+    if (!subtitle.num_rects)
         return ret;
 
     for (i = 0; i < nb_output_streams; i++) {
-- 
1.8.4



More information about the ffmpeg-devel mailing list