Merge commit 'f7edcac040f73635fc1127489c9bb29ca8b43532'

* commit 'f7edcac040f73635fc1127489c9bb29ca8b43532':
  avpicture: Suppress warning from deprecated code

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

diff --cc libavcodec/avpicture.c
index 3613e50f2eecee458d4b7bc9060630e239dde6a9,786d740abd816949b3f4ae9f2c2c0a09b2743e7b..56435f4fc945cb3b344180fe7bb3d0c3e95da2a3
--- 1/libavcodec/avpicture.c
--- 2/libavcodec/avpicture.c
+++ b/libavcodec/avpicture.c
@@@ -32,7 -33,8 +33,8 @@@
  #include "libavutil/colorspace.h"
  
  #if FF_API_AVPICTURE
 -int avpicture_fill(AVPicture *picture, uint8_t *ptr,
+ FF_DISABLE_DEPRECATION_WARNINGS
 +int avpicture_fill(AVPicture *picture, const uint8_t *ptr,
                     enum AVPixelFormat pix_fmt, int width, int height)
  {
      return av_image_fill_arrays(picture->data, picture->linesize,
@@@ -73,7 -76,8 +75,8 @@@ void avpicture_free(AVPicture *picture
  void av_picture_copy(AVPicture *dst, const AVPicture *src,
                       enum AVPixelFormat pix_fmt, int width, int height)
  {
 -    av_image_copy(dst->data, dst->linesize, src->data,
 +    av_image_copy(dst->data, dst->linesize, (const uint8_t **)src->data,
                    src->linesize, pix_fmt, width, height);
  }
+ FF_ENABLE_DEPRECATION_WARNINGS
  #endif /* FF_API_AVPICTURE */

diff --cc libavcodec/imgconvert.c
index 807001e5417b31356eaa07e58ca7734e0e4574ed,ffa120037d13fbfd94bacdac96b25d799f2318ce..9471a8ae7f55692c794c05834b632e7801edadab
--- 1/libavcodec/imgconvert.c
--- 2/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@@ -321,31 -340,5 +324,32 @@@ int av_picture_pad(AVPicture *dst, cons
      return 0;
  }
  
 +#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_DISABLE_DEPRECATION_WARNINGS
  #endif /* FF_API_AVPICTURE */