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_decoder.cc | |
| parent | 18d58dc6984fb2adde029131a7b2e141a5daddbf (diff) | |
Allow build with the Ubuntu 16.04 version of FFmpeg.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index e5e1f04ac..698078b5b 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -495,12 +495,21 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP */ shared_ptr<Image> image (new Image (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true)); +#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT + /* Start of the first line in the subtitle */ + uint8_t* sub_p = rect->pict.data[0]; + /* sub_p looks up into a BGRA palette which is here + (i.e. first byte B, second G, third R, fourth A) + */ + uint32_t const * palette = (uint32_t *) rect->pict.data[1]; +#else /* Start of the first line in the subtitle */ uint8_t* sub_p = rect->data[0]; /* sub_p looks up into a BGRA palette which is here (i.e. first byte B, second G, third R, fourth A) */ uint32_t const * palette = (uint32_t *) rect->data[1]; +#endif /* And the stream has a map of those palette colours to colours chosen by the user; created a `mapped' palette from those settings. */ @@ -531,7 +540,11 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP /* XXX: this seems to be wrong to me (isn't the output image RGBA?) but it looks right on screen */ *out_line_p++ = (p.a << 24) | (p.r << 16) | (p.g << 8) | p.b; } +#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT + sub_p += rect->pict.linesize[0]; +#else sub_p += rect->linesize[0]; +#endif out_p += image->stride()[0] / sizeof (uint32_t); } |