Merge commit 'f7edcac0'

* commit 'f7edcac0':
  avpicture: Suppress warning from deprecated code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavcodec/avpicture.c

@@ -29,9 +29,11 @@
 #include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "libavutil/colorspace.h"
 
 #if FF_API_AVPICTURE
+FF_DISABLE_DEPRECATION_WARNINGS
 int avpicture_fill(AVPicture *picture, const uint8_t *ptr,
                    enum AVPixelFormat pix_fmt, int width, int height)
 {
@@ -76,4 +78,5 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src,
     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 */

libavcodec/imgconvert.c

@@ -38,6 +38,7 @@
 #include "libavutil/colorspace.h"
 #include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/internal.h"
 #include "libavutil/imgutils.h"
 
 void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift)
@@ -196,6 +197,8 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
 }
 
 #if FF_API_AVPICTURE
+FF_DISABLE_DEPRECATION_WARNINGS
+
 int av_picture_crop(AVPicture *dst, const AVPicture *src,
                     enum AVPixelFormat pix_fmt, int top_band, int left_band)
 {
@@ -348,4 +351,5 @@ int main(void){
 }
 
 #endif
+FF_DISABLE_DEPRECATION_WARNINGS
 #endif /* FF_API_AVPICTURE */