diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:02:01 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:02:01 +0000 |
| commit | fa6c7ccc20d3dc8f220af31f10a159e1b7a13b92 (patch) | |
| tree | 39281c471d2dd52c27a7e8fb04f446803d3e5ef2 /libavcodec/imgconvert.c | |
| parent | fa48cd8814e790d837179f8336d129ea1c2f9f8c (diff) | |
| parent | f7168d7016f7d1034ec90223fa91a90711704e11 (diff) | |
| download | ffmpeg-fa6c7ccc20d3dc8f220af31f10a159e1b7a13b92.tar.gz | |
Merge commit 'f7168d7016f7d1034ec90223fa91a90711704e11'
* commit 'f7168d7016f7d1034ec90223fa91a90711704e11':
imgconvert: Move AVPicture-related static function to the deprecated section
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 2c246f6291..e9178843b6 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -82,6 +82,8 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p return best; } +#if FF_API_AVPICTURE +FF_DISABLE_DEPRECATION_WARNINGS /* return true if yuv planar */ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) { @@ -103,9 +105,6 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) return 1; } -#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) { |