diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
| commit | 0f3c2864599f9e5a5ec001266b4aefb0205d1e1f (patch) | |
| tree | 2158a8f135e4a196b784df285db008e5ec2439e5 /src/lib/image.cc | |
| parent | bdae32bb84672026c1a373e809804109e95accf4 (diff) | |
| parent | a2668dcfc484e5e2b158bd3b51b835a96660c8d8 (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/image.cc')
| -rw-r--r-- | src/lib/image.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |