From 0e9cc320b18ae53e2bf0cc8fdb9984b58e33e0ec Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 2 Mar 2016 00:22:55 +0000
Subject: [PATCH] Bump ffmpeg to master somewhere post 3.0.

---
 ChangeLog                  | 4 ++++
 cscript                    | 2 +-
 src/lib/ffmpeg.cc          | 4 ++--
 src/lib/ffmpeg_examiner.cc | 6 ++----
 src/lib/image.cc           | 8 ++++----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f35e0adbc..89472fec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-08  Carl Hetherington  <cth@carlh.net>
+
+	* Bump ffmpeg to git master, somewhere post 3.0.
+
 2016-03-08  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.7.0 released.
diff --git a/cscript b/cscript
index 2bb2b6c28..14a48811f 100644
--- a/cscript
+++ b/cscript
@@ -261,7 +261,7 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
+    return (('ffmpeg-cdist', '1ebd1c8', ffmpeg_options),
             ('libdcp', 'v1.3.1'),
             ('libsub', 'v1.1.11'))
 
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 9d6921dcf..296002c74 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -280,9 +280,9 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
 		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 ();
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index abca5fee7..648660478 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -134,7 +134,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 			}
 		}
 
-		av_free_packet (&_packet);
+		av_packet_unref (&_packet);
 
 		if (_first_video && got_all_audio && _subtitle_streams.empty ()) {
 			/* All done */
@@ -249,7 +249,7 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
 
 		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,
@@ -417,8 +417,6 @@ FFmpegExaminer::yuv () const
 	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:
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 37aa2b5e3..7ccb9906e 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -581,15 +581,15 @@ Image::bytes_per_pixel (int c) const
 
 	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) {
-- 
2.30.2