* Store time zone with cinemas and use them to
mark KDM start and end times correctly (#788).
+ * Bump ffmpeg to git master, somewhere post 3.0.
+
2016-03-08 Carl Hetherington <cth@carlh.net>
* Version 2.7.0 released.
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
+ return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
('libdcp', 'v1.3.1'),
('libsub', 'v1.1.11'))
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 ();
}
}
- av_free_packet (&_packet);
+ av_packet_unref (&_packet);
if (_first_video && got_all_audio && _subtitle_streams.empty ()) {
/* All done */
for (unsigned int i = 0; i < sub.num_rects; ++i) {
if (sub.rects[i]->type == SUBTITLE_BITMAP) {
- uint32_t* palette = (uint32_t *) sub.rects[i]->pict.data[1];
+ uint32_t* palette = (uint32_t *) sub.rects[i]->data[1];
for (int j = 0; j < sub.rects[i]->nb_colors; ++j) {
RGBA rgba (
(palette[j] & 0x00ff0000) >> 16,
case AV_PIX_FMT_YUV444P10LE:
case AV_PIX_FMT_YUV422P9BE:
case AV_PIX_FMT_YUV422P9LE:
- case AV_PIX_FMT_YUVA422P_LIBAV:
- case AV_PIX_FMT_YUVA444P_LIBAV:
case AV_PIX_FMT_YUVA420P9BE:
case AV_PIX_FMT_YUVA420P9LE:
case AV_PIX_FMT_YUVA422P9BE:
float bpp[4] = { 0, 0, 0, 0 };
- bpp[0] = floor ((d->comp[0].depth_minus1 + 1 + 7) / 8);
+ bpp[0] = floor ((d->comp[0].depth + 7) / 8);
if (d->nb_components > 1) {
- bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
+ bpp[1] = floor ((d->comp[1].depth + 7) / 8) / pow (2.0f, d->log2_chroma_w);
}
if (d->nb_components > 2) {
- bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
+ bpp[2] = floor ((d->comp[2].depth + 7) / 8) / pow (2.0f, d->log2_chroma_w);
}
if (d->nb_components > 3) {
- bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
+ bpp[3] = floor ((d->comp[3].depth + 7) / 8) / pow (2.0f, d->log2_chroma_w);
}
if ((d->flags & AV_PIX_FMT_FLAG_PLANAR) == 0) {