Skip to content
Snippets Groups Projects
Commit 86611ff1 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

pnm: Use av_pix_fmt_desc_get instead of accessing the array directly


This fixes boken fate tests with MSVC with DLLs, broken since
b5f536d2.

Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent 5c869655
No related branches found
No related tags found
No related merge requests found
...@@ -173,7 +173,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) ...@@ -173,7 +173,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
}else }else
s->maxval=1; s->maxval=1;
/* more check if YUV420 */ /* 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) if ((avctx->width & 1) != 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
h = (avctx->height * 2); h = (avctx->height * 2);
......
...@@ -89,7 +89,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -89,7 +89,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
"P%c\n%d %d\n", c, avctx->width, h1); "P%c\n%d %d\n", c, avctx->width, h1);
s->bytestream += strlen(s->bytestream); s->bytestream += strlen(s->bytestream);
if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) { 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, snprintf(s->bytestream, s->bytestream_end - s->bytestream,
"%d\n", maxdepth); "%d\n", maxdepth);
s->bytestream += strlen(s->bytestream); s->bytestream += strlen(s->bytestream);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment