diff options
| -rw-r--r-- | libavcodec/iff.c | 32 | ||||
| -rw-r--r-- | libavformat/iff.c | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 2c783ee5ce..8e3e53b04d 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -219,25 +219,25 @@ static int decode_frame_ilbm(AVCodecContext *avctx, } if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved - if (avctx->pix_fmt == PIX_FMT_PAL8) { - for(y = 0; y < avctx->height; y++ ) { - uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; - memset(row, 0, avctx->width); - for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { - decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane); - buf += s->planesize; + if (avctx->pix_fmt == PIX_FMT_PAL8) { + for(y = 0; y < avctx->height; y++ ) { + uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; + memset(row, 0, avctx->width); + for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { + decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane); + buf += s->planesize; + } } - } - } else { // PIX_FMT_BGR32 - for(y = 0; y < avctx->height; y++ ) { - uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; - memset(row, 0, avctx->width << 2); - for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { - decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane); - buf += s->planesize; + } else { // PIX_FMT_BGR32 + for(y = 0; y < avctx->height; y++ ) { + uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; + memset(row, 0, avctx->width << 2); + for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { + decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane); + buf += s->planesize; + } } } - } } else if (avctx->pix_fmt == PIX_FMT_PAL8) { // IFF-PBM for(y = 0; y < avctx->height; y++ ) { uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]]; diff --git a/libavformat/iff.c b/libavformat/iff.c index fcb3ff6b26..4288c3dcb6 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -256,7 +256,7 @@ static int iff_read_header(AVFormatContext *s, case AVMEDIA_TYPE_VIDEO: switch (compression) { case BITMAP_RAW: - st->codec->codec_id = CODEC_ID_IFF_ILBM; + st->codec->codec_id = CODEC_ID_IFF_ILBM; break; case BITMAP_BYTERUN1: st->codec->codec_id = CODEC_ID_IFF_BYTERUN1; |