From e5eec6c5e7b96cc6e7697bbf42d3f27546c5ad52 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 3 May 2016 23:21:01 +0100 Subject: Allow build with the Ubuntu 16.04 version of FFmpeg. --- src/lib/ffmpeg.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/lib/ffmpeg.cc') diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 296002c74..656142cd4 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -280,10 +280,17 @@ FFmpeg::subtitle_id (AVSubtitle const & sub) 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); + } +#else int const line = rect->linesize[0]; for (int j = 0; j < rect->h; ++j) { digester.add (rect->data[0] + j * line, line); } +#endif } return digester.get (); } -- cgit v1.2.3