Fix merge.

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

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 954aff728386cb198ff4d79d0839ac3bdff8f169..296002c742385cbbc4a2f10ea3e6f7bbefa86348 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -280,14 +280,41 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
                digester.add (rect->y);
                digester.add (rect->w);
                digester.add (rect->h);
-               int const line = rect->pict.linesize[0];
+               int const line = rect->linesize[0];
                for (int j = 0; j < rect->h; ++j) {
-                       digester.add (rect->pict.data[0] + j * line, line);
+                       digester.add (rect->data[0] + j * line, line);
                }
        }
        return digester.get ();
 }
 
+/** @return true if sub starts a new image subtitle */
+bool
+FFmpeg::subtitle_starts_image (AVSubtitle const & sub)
+{
+       bool image = false;
+       bool text = false;
+
+       for (unsigned int i = 0; i < sub.num_rects; ++i) {
+               switch (sub.rects[i]->type) {
+               case SUBTITLE_BITMAP:
+                       image = true;
+                       break;
+               case SUBTITLE_TEXT:
+               case SUBTITLE_ASS:
+                       text = true;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       /* We can't cope with mixed image/text in one AVSubtitle */
+       DCPOMATIC_ASSERT (!image || !text);
+
+       return image;
+}
+
 /** Compute the pts offset to use given a set of audio streams and some video details.
  *  Sometimes these parameters will have just been determined by an Examiner, sometimes
  *  they will have been retrieved from a piece of Content, hence the need for this method