diff options
| author | Martin Storsjö <martin@martin.st> | 2013-02-28 18:05:50 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-02-28 18:29:03 +0200 |
| commit | 86611ff123d6ff2504931efa041bff24e5619daf (patch) | |
| tree | 07cb04f0c34456a87d5a367c85605b6dedc5694b | |
| parent | 5c8696555abd30a200d0d882e2913f66619fba68 (diff) | |
| download | ffmpeg-86611ff123d6ff2504931efa041bff24e5619daf.tar.gz | |
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
This fixes boken fate tests with MSVC with DLLs, broken since
b5f536d24.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 094e03d8fa..5f2fa4966c 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -173,7 +173,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 b09649202d..7d8792f0ff 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -89,7 +89,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); |