diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:39:56 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:40:04 +0300 |
commit | 0bcb17d44e3c667af8d85aec2af41ae6a30308d5 (patch) | |
tree | d8f1ac44098b15ea8763a8962a47aff1a65e69b3 /libavcodec/imgconvert.c | |
parent | 15d8b6512552b0831656e7ed3d45d6a4093a83b8 (diff) | |
parent | dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c (diff) |
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/imgconvert.c')
-rw-r--r-- | libavcodec/imgconvert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 2241cc1760..807001e541 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -195,6 +195,7 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) return 1; } +#if FF_API_AVPICTURE int av_picture_crop(AVPicture *dst, const AVPicture *src, enum AVPixelFormat pix_fmt, int top_band, int left_band) { @@ -347,3 +348,4 @@ int main(void){ } #endif +#endif /* FF_API_AVPICTURE */ |