Bump ffmpeg to master somewhere post 3.0.

diff --git a/ChangeLog b/ChangeLog
index f35e0adbc1505d006641301058b562250eba55e5..89472fec5e63969cf7205628123fa1fda8fd6297 100644 (file)
--- 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 2bb2b6c28cbfa33aa396da3ca511d3eb9db5d928..14a48811fb63a33418925e6e56e2cd493bb6b264 100644 (file)
--- 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 9d6921dcfbf33e2fab4f3ade9887ca66ad4bf6e7..296002c742385cbbc4a2f10ea3e6f7bbefa86348 100644 (file)
--- 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 abca5fee7936cedbc14e9a30de28fa8db82ac378..64866047863afc9de6b9f9893609d84958e4c723 100644 (file)
--- 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 37aa2b5e363e1a7545ca25e21ec60959d62f2635..7ccb9906eda8663ec6b3eb92a8d56f12802fe7aa 100644 (file)
--- 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) {