diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:27:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:27:39 +0100 |
| commit | 5ecf8189c682f41ab315e171e0e7721d7e272138 (patch) | |
| tree | 433c9660304b09d20e7d4cf2b511fb143d375699 /libavcodec | |
| parent | 198ea7a96f64b60d26068ac30605d5b50245abeb (diff) | |
| download | ffmpeg-5ecf8189c682f41ab315e171e0e7721d7e272138.tar.gz | |
pnm: use av_pix_fmt_desc_get()
Using the table directly may cause problems on some platforms like msvc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pnm.c | 2 | ||||
| -rw-r--r-- | libavcodec/pnmenc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index fe120c7971..6d1eb6d0ed 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_descriptors[avctx->pix_fmt].flags & PIX_FMT_PLANAR) { + if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & PIX_FMT_PLANAR) { if ((avctx->width & 1) != 0) return AVERROR_INVALIDDATA; h = (avctx->height * 2); diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 47e91f4efd..8cd96bed5d 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -90,7 +90,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, "P%c\n%d %d\n", c, avctx->width, h1); s->bytestream += strlen(s->bytestream); if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) { - int maxdepth = (1 << (av_pix_fmt_descriptors[avctx->pix_fmt].comp[0].depth_minus1 + 1)) - 1; + int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1; snprintf(s->bytestream, s->bytestream_end - s->bytestream, "%d\n", maxdepth); s->bytestream += strlen(s->bytestream); |