From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Tue, 16 Feb 2016 16:52:45 +0000 (+0000)
Subject: Merge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3f462fcf76bb99bc2cb14575eaa7a020595ca277;p=ffmpeg

Merge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'

* commit '1546a41adae818b340acdd9b5dacd6d0a92b6507':
  pixdesc: Drop unneeded deprecation warning guards

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---

3f462fcf76bb99bc2cb14575eaa7a020595ca277
diff --cc libavutil/pixdesc.c
index 58833cfb8ed,059bd62441e..2bca44062fe
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@@ -2209,48 -1734,6 +2208,47 @@@ int av_pix_fmt_count_planes(enum AVPixe
      return ret;
  }
  
 +void ff_check_pixfmt_descriptors(void){
 +    int i, j;
 +
 +    for (i=0; i<FF_ARRAY_ELEMS(av_pix_fmt_descriptors); i++) {
 +        const AVPixFmtDescriptor *d = &av_pix_fmt_descriptors[i];
 +        uint8_t fill[4][8+6+3] = {{0}};
 +        uint8_t *data[4] = {fill[0], fill[1], fill[2], fill[3]};
 +        int linesize[4] = {0,0,0,0};
 +        uint16_t tmp[2];
 +
 +        if (!d->name && !d->nb_components && !d->log2_chroma_w && !d->log2_chroma_h && !d->flags)
 +            continue;
 +//         av_log(NULL, AV_LOG_DEBUG, "Checking: %s\n", d->name);
 +        av_assert0(d->log2_chroma_w <= 3);
 +        av_assert0(d->log2_chroma_h <= 3);
 +        av_assert0(d->nb_components <= 4);
 +        av_assert0(d->name && d->name[0]);
 +        av_assert0((d->nb_components==4 || d->nb_components==2) == !!(d->flags & AV_PIX_FMT_FLAG_ALPHA));
 +        av_assert2(av_get_pix_fmt(d->name) == i);
 +
 +        for (j=0; j<FF_ARRAY_ELEMS(d->comp); j++) {
 +            const AVComponentDescriptor *c = &d->comp[j];
 +            if(j>=d->nb_components) {
 +                av_assert0(!c->plane && !c->step && !c->offset && !c->shift && !c->depth);
 +                continue;
 +            }
 +            if (d->flags & AV_PIX_FMT_FLAG_BITSTREAM) {
 +                av_assert0(c->step >= c->depth);
 +            } else {
 +                av_assert0(8*c->step >= c->depth);
 +            }
 +            if (!strncmp(d->name, "bayer_", 6))
 +                continue;
 +            av_read_image_line(tmp, (void*)data, linesize, d, 0, 0, j, 2, 0);
 +            av_assert0(tmp[0] == 0 && tmp[1] == 0);
 +            tmp[0] = tmp[1] = (1<<c->depth) - 1;
 +            av_write_image_line(tmp, data, linesize, d, 0, 0, j, 2);
 +        }
 +    }
 +}
- FF_ENABLE_DEPRECATION_WARNINGS
 +
  
  enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt)
  {