diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 12:39:56 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 12:40:04 +0100 |
| commit | 0bcb17d44e3c667af8d85aec2af41ae6a30308d5 (patch) | |
| tree | d8f1ac44098b15ea8763a8962a47aff1a65e69b3 /libavcodec/avpicture.c | |
| parent | 15d8b6512552b0831656e7ed3d45d6a4093a83b8 (diff) | |
| parent | dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c (diff) | |
| download | ffmpeg-0bcb17d44e3c667af8d85aec2af41ae6a30308d5.tar.gz | |
Merge commit 'dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c'
* commit 'dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c':
lavc: Deprecate AVPicture structure and related functions
Deprecation flag on AVPicture struct replaced by a comment, as it causes
excess deprecation warnings for every include of avcodec.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avpicture.c')
| -rw-r--r-- | libavcodec/avpicture.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c index 0484dc3f7b..3613e50f2e 100644 --- a/libavcodec/avpicture.c +++ b/libavcodec/avpicture.c @@ -31,6 +31,7 @@ #include "libavutil/imgutils.h" #include "libavutil/colorspace.h" +#if FF_API_AVPICTURE int avpicture_fill(AVPicture *picture, const uint8_t *ptr, enum AVPixelFormat pix_fmt, int width, int height) { @@ -75,4 +76,4 @@ 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); } - +#endif /* FF_API_AVPICTURE */ |