diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2015-11-26 16:10:54 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-12-05 13:12:27 +0100 |
| commit | f7edcac040f73635fc1127489c9bb29ca8b43532 (patch) | |
| tree | 8c0358b0317466b27a97fc1c0c6b6f27a6b56194 /libavcodec | |
| parent | b805482b1fba1d82fbe47023a24c9261f18979b6 (diff) | |
| download | ffmpeg-f7edcac040f73635fc1127489c9bb29ca8b43532.tar.gz | |
avpicture: Suppress warning from deprecated code
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avpicture.c | 3 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c index eaa5c2614e..786d740abd 100644 --- a/libavcodec/avpicture.c +++ b/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, uint8_t *ptr, enum AVPixelFormat pix_fmt, int width, int height) { @@ -77,4 +79,5 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src, av_image_copy(dst->data, dst->linesize, src->data, src->linesize, pix_fmt, width, height); } +FF_ENABLE_DEPRECATION_WARNINGS #endif /* FF_API_AVPICTURE */ diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 55a9213a92..ffa120037d 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -37,6 +37,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) @@ -253,6 +254,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) { @@ -336,4 +339,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, } return 0; } + +FF_DISABLE_DEPRECATION_WARNINGS #endif /* FF_API_AVPICTURE */ |