OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
892f037
)
imgconvert: Move AVPicture-related static function to the deprecated section
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 19 Jan 2016 21:09:51 +0000
(16:09 -0500)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Thu, 21 Jan 2016 20:33:19 +0000
(15:33 -0500)
libavcodec/imgconvert.c
patch
|
blob
|
history
diff --git
a/libavcodec/imgconvert.c
b/libavcodec/imgconvert.c
index
489ce7a
..
6528c96
100644
(file)
--- a/
libavcodec/imgconvert.c
+++ b/
libavcodec/imgconvert.c
@@
-153,6
+153,8
@@
enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
return dst_pix_fmt;
}
+#if FF_API_AVPICTURE
+FF_DISABLE_DEPRECATION_WARNINGS
/* return true if yuv planar */
static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
{
@@
-160,9
+162,6
@@
static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
(desc->flags & AV_PIX_FMT_FLAG_PLANAR));
}
-#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)
{