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/pnm.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/pnm.c')
| -rw-r--r-- | libavcodec/pnm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 33b8896555..308457bbe9 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -181,7 +181,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) }else s->maxval=1; /* more check if YUV420 */ - if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & PIX_FMT_PLANAR) { + if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) { if ((avctx->width & 1) != 0) return AVERROR_INVALIDDATA; h = (avctx->height * 2); |