diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-03 23:21:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-04 00:42:36 +0100 |
| commit | e5eec6c5e7b96cc6e7697bbf42d3f27546c5ad52 (patch) | |
| tree | cc9e17bc41d50a5b63b561513627cd4e49164a78 /src/lib/ffmpeg.cc | |
| parent | 18d58dc6984fb2adde029131a7b2e141a5daddbf (diff) | |
Allow build with the Ubuntu 16.04 version of FFmpeg.
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 7 |
1 files changed, 7 insertions, 0 deletions
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 (); } |