Skip to content

F
ffmpeg.wasm-core
Commit 86b6e49d authored by ami_stuff's avatar ami_stuff Committed by Michael Niedermayer
Browse files
Options

iff: check for pbm tag 

more robust
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1c273598
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 22 deletions
libavcodec/iff.c
View file @ 86b6e49d
...@@ -541,7 +541,8 @@ static int decode_frame_ilbm(AVCodecContext *avctx, ...@@ -541,7 +541,8 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
} }
} }
} }
} else if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) { // IFF-PBM } else if (avctx->codec_tag == MKTAG('P','B','M',' ')) { // IFF-PBM
if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) {
for(y = 0; y < avctx->height; y++ ) { for(y = 0; y < avctx->height; y++ ) {
uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]]; uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
memcpy(row, buf, FFMIN(avctx->width, buf_end - buf)); memcpy(row, buf, FFMIN(avctx->width, buf_end - buf));
...@@ -555,6 +556,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx, ...@@ -555,6 +556,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, s->planesize); decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, s->planesize);
} }
} }
}
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame; *(AVFrame*)data = s->frame;
...@@ -630,7 +632,8 @@ static int decode_frame_byterun1(AVCodecContext *avctx, ...@@ -630,7 +632,8 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
} }
} }
} }
} else if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) { // IFF-PBM } else if (avctx->codec_tag == MKTAG('P','B','M',' ')) { // IFF-PBM
if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) {
for(y = 0; y < avctx->height ; y++ ) { for(y = 0; y < avctx->height ; y++ ) {
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
buf += decode_byterun(row, avctx->width, buf, buf_end); buf += decode_byterun(row, avctx->width, buf, buf_end);
...@@ -642,6 +645,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx, ...@@ -642,6 +645,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, s->planesize); decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, s->planesize);
} }
} }
}
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame; *(AVFrame*)data = s->frame;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment