From d7d1a6b8d97390e57ce8d2442d90d25f97d8b562 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Oct 2012 00:52:08 +0100
Subject: Cope with AVSubtitles having no AVSubtitleRects.

---
 src/lib/ffmpeg_decoder.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg_decoder.cc')

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 828934604..554188343 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -254,7 +254,12 @@ FFmpegDecoder::do_pass ()
 		int got_subtitle;
 		AVSubtitle sub;
 		if (avcodec_decode_subtitle2 (_subtitle_codec_context, &sub, &got_subtitle, &_packet) && got_subtitle) {
-			process_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub)));
+			/* I'm not entirely sure why, but sometimes we get an AVSubtitle with
+			   no AVSubtitleRects.
+			*/
+			if (sub.num_rects > 0) {
+				process_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub)));
+			}
 			avsubtitle_free (&sub);
 		}
 	}
-- 
cgit v1.2.3