virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'f7168d7016f7d1034ec90223fa91a90711704e11'

Browse Source 
* commit 'f7168d7016f7d1034ec90223fa91a90711704e11':
  imgconvert: Move AVPicture-related static function to the deprecated section

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-01-27 20:02:01 +00:00
parent fa48cd8814 f7168d7016
commit fa6c7ccc20
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/imgconvert.c
View File

@@ -82,6 +82,8 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p
return best; return best;
} }
#if FF_API_AVPICTURE
FF_DISABLE_DEPRECATION_WARNINGS
/* return true if yuv planar */ /* return true if yuv planar */
static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
{ {
@@ -103,9 +105,6 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
return 1; return 1;
} }
#if FF_API_AVPICTURE
FF_DISABLE_DEPRECATION_WARNINGS
int av_picture_crop(AVPicture *dst, const AVPicture *src, int av_picture_crop(AVPicture *dst, const AVPicture *src,
enum AVPixelFormat pix_fmt, int top_band, int left_band) enum AVPixelFormat pix_fmt, int top_band, int left_band)
{ {