diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-03-01 01:00:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-01 01:00:16 +0000 |
| commit | 0914bfdbfc498d99821c2cd0ca3a4f9a184d07b5 (patch) | |
| tree | c47583043a15279e0933f6697deefb7768ba352c /src/lib/ffmpeg.h | |
| parent | 8b7080da3ff8b6df0df7f1858c144c163cbaf4c6 (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.h')
| -rw-r--r-- | src/lib/ffmpeg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index 9795b2229..43efcf74f 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,7 +58,7 @@ protected: static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub); static std::string subtitle_id (AVSubtitle const & sub); - static bool subtitle_is_image (AVSubtitle const & sub); + static bool subtitle_starts_image (AVSubtitle const & sub); boost::shared_ptr<const FFmpegContent> _ffmpeg_content; |