mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-11 09:35:22 +00:00
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>
This commit is contained in:
parent
198ea7a96f
commit
5ecf8189c6
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user