Fix merge.

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

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 29dda1b9eaa0bbab513bd110d2dfe41c402ae43a..296002c742385cbbc4a2f10ea3e6f7bbefa86348 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -280,16 +280,17 @@ 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_is_image (AVSubtitle const & sub)
+FFmpeg::subtitle_starts_image (AVSubtitle const & sub)
 {
        bool image = false;
        bool text = false;