Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'

* commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81':
  imgconvert: Re-enable the deprecation warnings

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/imgconvert.c
index 9471a8ae7f55692c794c05834b632e7801edadab,6354868631a8d88e35541898e38da1ebc282f726..7d5dff6a83e7da2c1fbbe044d23123dc6c6d1992
--- 1/libavcodec/imgconvert.c
--- 2/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@@ -324,32 -340,5 +324,32 @@@ int av_picture_pad(AVPicture *dst, cons
      return 0;
  }
  
- FF_DISABLE_DEPRECATION_WARNINGS
 +#ifdef TEST
 +
 +int main(void){
 +    int i;
 +    int err=0;
 +    int skip = 0;
 +
 +    for (i=0; i<AV_PIX_FMT_NB*2; i++) {
 +        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);
 +        if(!desc || !desc->name) {
 +            skip ++;
 +            continue;
 +        }
 +        if (skip) {
 +            av_log(NULL, AV_LOG_INFO, "%3d unused pixel format values\n", skip);
 +            skip = 0;
 +        }
 +        av_log(NULL, AV_LOG_INFO, "pix fmt %s yuv_plan:%d avg_bpp:%d\n", desc->name, is_yuv_planar(desc), av_get_padded_bits_per_pixel(desc));
 +        if ((!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) != (desc->nb_components != 2 && desc->nb_components != 4)) {
 +            av_log(NULL, AV_LOG_ERROR, "Alpha flag mismatch\n");
 +            err = 1;
 +        }
 +    }
 +    return err;
 +}
 +
 +#endif
+ FF_ENABLE_DEPRECATION_WARNINGS
  #endif /* FF_API_AVPICTURE */