Bump ffmpeg to master somewhere post 3.0.

[dcpomatic.git] / src / lib / image.cc

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) {