aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-21 16:11:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-21 17:03:31 +0100
commit0efa240f2bd28b3e9099e4e34c85cdd7062a8086 (patch)
tree5d110a3bf6361e3366a584bf5728f55914ef39c5
parentbe19e7e3739689f72756da3dd5a68479ebecdcc8 (diff)
downloadffmpeg-0efa240f2bd28b3e9099e4e34c85cdd7062a8086.tar.gz
is_yuv_planar: remove use of PixFmtInfo
This fixes the behavior for a few yuva 16bit formats Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/imgconvert.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index c45203e832..e79daccc80 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -704,13 +704,12 @@ void ff_shrink88(uint8_t *dst, int dst_wrap,
/* return true if yuv planar */
static inline int is_yuv_planar(enum AVPixelFormat fmt)
{
- const PixFmtInfo *info = &pix_fmt_info[fmt];
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
int i;
int planes[4] = { 0 };
- if (info->color_type != FF_COLOR_YUV &&
- info->color_type != FF_COLOR_YUV_JPEG)
+ if ( desc->flags & PIX_FMT_RGB
+ || !(desc->flags & PIX_FMT_PLANAR))
return 0;
/* set the used planes */