Commit f7edcac0 authored by Luca Barbato's avatar Luca Barbato

avpicture: Suppress warning from deprecated code

parent b805482b
...@@ -29,9 +29,11 @@ ...@@ -29,9 +29,11 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "libavutil/colorspace.h" #include "libavutil/colorspace.h"
#if FF_API_AVPICTURE #if FF_API_AVPICTURE
FF_DISABLE_DEPRECATION_WARNINGS
int avpicture_fill(AVPicture *picture, uint8_t *ptr, int avpicture_fill(AVPicture *picture, uint8_t *ptr,
enum AVPixelFormat pix_fmt, int width, int height) enum AVPixelFormat pix_fmt, int width, int height)
{ {
...@@ -77,4 +79,5 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src, ...@@ -77,4 +79,5 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src,
av_image_copy(dst->data, dst->linesize, src->data, av_image_copy(dst->data, dst->linesize, src->data,
src->linesize, pix_fmt, width, height); src->linesize, pix_fmt, width, height);
} }
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_AVPICTURE */ #endif /* FF_API_AVPICTURE */
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "libavutil/colorspace.h" #include "libavutil/colorspace.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/internal.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift)
...@@ -253,6 +254,8 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) ...@@ -253,6 +254,8 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
} }
#if FF_API_AVPICTURE #if FF_API_AVPICTURE
FF_DISABLE_DEPRECATION_WARNINGS
int av_picture_crop(AVPicture *dst, const AVPicture *src, int av_picture_crop(AVPicture *dst, const AVPicture *src,
enum AVPixelFormat pix_fmt, int top_band, int left_band) enum AVPixelFormat pix_fmt, int top_band, int left_band)
{ {
...@@ -336,4 +339,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, ...@@ -336,4 +339,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
} }
return 0; return 0;
} }
FF_DISABLE_DEPRECATION_WARNINGS
#endif /* FF_API_AVPICTURE */ #endif /* FF_API_AVPICTURE */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment