Another Windows build fix.

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

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 4b95666b800cbf6525314b5525c4f6645bf61201..2038d6a8590f2e6df8a2d9c7301ac92251be05c4 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -110,8 +110,6 @@ FFmpeg::ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl)
 void
 FFmpeg::setup_general ()
 {
-       av_register_all ();
-
        /* This might not work too well in some cases of multiple FFmpeg decoders,
           but it's probably good enough.
        */
@@ -282,21 +280,27 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
        digester.add (sub.pts);
        for (unsigned int i = 0; i < sub.num_rects; ++i) {
                AVSubtitleRect* rect = sub.rects[i];
-               digester.add (rect->x);
-               digester.add (rect->y);
-               digester.add (rect->w);
-               digester.add (rect->h);
+               if (rect->type == SUBTITLE_BITMAP) {
+                       digester.add (rect->x);
+                       digester.add (rect->y);
+                       digester.add (rect->w);
+                       digester.add (rect->h);
 #ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
-               int const line = rect->pict.linesize[0];
-               for (int j = 0; j < rect->h; ++j) {
-                       digester.add (rect->pict.data[0] + j * line, line);
-               }
+                       int const line = rect->pict.linesize[0];
+                       for (int j = 0; j < rect->h; ++j) {
+                               digester.add (rect->pict.data[0] + j * line, line);
+                       }
 #else
-               int const line = rect->linesize[0];
-               for (int j = 0; j < rect->h; ++j) {
-                       digester.add (rect->data[0] + j * line, line);
-               }
+                       int const line = rect->linesize[0];
+                       for (int j = 0; j < rect->h; ++j) {
+                               digester.add (rect->data[0] + j * line, line);
+                       }
 #endif
+               } else if (rect->type == SUBTITLE_TEXT) {
+                       digester.add (string (rect->text));
+               } else if (rect->type == SUBTITLE_ASS) {
+                       digester.add (string (rect->ass));
+               }
        }
        return digester.get ();
 }
@@ -375,7 +379,7 @@ FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, option
        /* Now adjust so that the video pts starts on a frame */
        if (first_video) {
                ContentTime const fvc = first_video.get() + po;
-               po += fvc.round_up (video_frame_rate) - fvc;
+               po += fvc.ceil (video_frame_rate) - fvc;
        }
 
        return po;