diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-08 10:03:08 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-08 10:03:08 +0100 |
| commit | 68cb0dc8a3e8acec047ed078cd2c021d4dd94024 (patch) | |
| tree | f08a26751ef3f6670a1f18cf05a74c51dbc33436 /libavcodec/avpicture.c | |
| parent | 92186f2d1006c1a2cfcac79a656477f1ddeb34d9 (diff) | |
| parent | f7edcac040f73635fc1127489c9bb29ca8b43532 (diff) | |
| download | ffmpeg-68cb0dc8a3e8acec047ed078cd2c021d4dd94024.tar.gz | |
Merge commit 'f7edcac040f73635fc1127489c9bb29ca8b43532'
* commit 'f7edcac040f73635fc1127489c9bb29ca8b43532':
avpicture: Suppress warning from deprecated code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avpicture.c')
| -rw-r--r-- | libavcodec/avpicture.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c index 3613e50f2e..56435f4fc9 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, 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 */ |