summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-03-01 01:00:16 +0000
committerCarl Hetherington <cth@carlh.net>2016-03-01 01:00:16 +0000
commit0914bfdbfc498d99821c2cd0ca3a4f9a184d07b5 (patch)
treec47583043a15279e0933f6697deefb7768ba352c /src/lib/ffmpeg.cc
parent8b7080da3ff8b6df0df7f1858c144c163cbaf4c6 (diff)
Stop erroneous addition of text subtitles to the lists (when
an image subtitle is completed with a rect count of zero) which subsequently cause hangs while the decoder looks for these phantom text subtitles. Fixes #812.
Diffstat (limited to 'src/lib/ffmpeg.cc')
-rw-r--r--src/lib/ffmpeg.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 29dda1b9e..9d6921dcf 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -288,8 +288,9 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
return digester.get ();
}
+/** @return true if sub starts a new image subtitle */
bool
-FFmpeg::subtitle_is_image (AVSubtitle const & sub)
+FFmpeg::subtitle_starts_image (AVSubtitle const & sub)
{
bool image = false;
bool text = false;