Stop erroneous addition of text subtitles to the lists (when

[dcpomatic.git] / src / lib / ffmpeg_examiner.cc

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 850b8ba5facb2dae7d400d1c8a53c0584ea38b3d..abca5fee7936cedbc14e9a30de28fa8db82ac378 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -217,13 +217,13 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
        if (avcodec_decode_subtitle2 (context, &sub, &frame_finished, &_packet) >= 0 && frame_finished) {
                string id = subtitle_id (sub);
                FFmpegSubtitlePeriod const period = subtitle_period (sub);
-               bool const image = subtitle_is_image (sub);
+               bool const starts_image = subtitle_starts_image (sub);
 
                LastSubtitleMap::iterator last = _last_subtitle_start.find (stream);
                if (last != _last_subtitle_start.end() && last->second) {
                        /* We have seen the start of a subtitle but not yet the end.  Whatever this is
                           finishes the previous subtitle, so add it */
-                       if (image) {
+                       if (last->second->image) {
                                stream->add_image_subtitle (last->second->id, ContentTimePeriod (last->second->time, period.from));
                        } else {
                                stream->add_text_subtitle (last->second->id, ContentTimePeriod (last->second->time, period.from));
@@ -233,17 +233,17 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
                                _last_subtitle_start[stream] = optional<SubtitleStart> ();
                        } else {
                                /* This is just another subtitle, so we start again */
-                               _last_subtitle_start[stream] = SubtitleStart (id, image, period.from);
+                               _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
                        }
                } else if (sub.num_rects == 1) {
                        if (period.to) {
-                               if (image) {
+                               if (starts_image) {
                                        stream->add_image_subtitle (id, ContentTimePeriod (period.from, period.to.get ()));
                                } else {
                                        stream->add_text_subtitle (id, ContentTimePeriod (period.from, period.to.get ()));
                                }
                        } else {
-                               _last_subtitle_start[stream] = SubtitleStart (id, image, period.from);
+                               _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
                        }
                }