diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:50:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:10:09 +0200 |
| commit | ff4680922fc4f1295081da45173e9a71d141a045 (patch) | |
| tree | f30f162527bfc053e0bf5139289e83311cb16e10 /libavcodec/imgconvert.c | |
| parent | 75835abe910f686cc8dda1fc1ac147f412ecdeda (diff) | |
| parent | e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index db52455c9f..6312ec93e8 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -77,7 +77,7 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { if(desc->name && !strncmp(desc->name, "yuvj", 4)) return FF_COLOR_YUV_JPEG; - if(desc->flags & PIX_FMT_RGB) + if(desc->flags & AV_PIX_FMT_FLAG_RGB) return FF_COLOR_RGB; if(desc->nb_components == 0) @@ -366,8 +366,8 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) int i; int planes[4] = { 0 }; - if ( desc->flags & PIX_FMT_RGB - || !(desc->flags & PIX_FMT_PLANAR)) + if ( desc->flags & AV_PIX_FMT_FLAG_RGB + || !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) return 0; /* set the used planes */ |