| OLD | NEW |
| 1 /* | 1 /* |
| 2 * IFF PBM/ILBM bitmap decoder | 2 * IFF PBM/ILBM bitmap decoder |
| 3 * Copyright (c) 2010 Peter Ross <pross@xvid.org> | 3 * Copyright (c) 2010 Peter Ross <pross@xvid.org> |
| 4 * Copyright (c) 2010 Sebastian Vater <cdgs.basty@googlemail.com> | 4 * Copyright (c) 2010 Sebastian Vater <cdgs.basty@googlemail.com> |
| 5 * | 5 * |
| 6 * This file is part of FFmpeg. | 6 * This file is part of FFmpeg. |
| 7 * | 7 * |
| 8 * FFmpeg is free software; you can redistribute it and/or | 8 * FFmpeg is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Lesser General Public | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 if (avctx->bits_per_coded_sample <= 8) { | 154 if (avctx->bits_per_coded_sample <= 8) { |
| 155 avctx->pix_fmt = (avctx->bits_per_coded_sample < 8 || | 155 avctx->pix_fmt = (avctx->bits_per_coded_sample < 8 || |
| 156 avctx->extradata_size) ? PIX_FMT_PAL8 | 156 avctx->extradata_size) ? PIX_FMT_PAL8 |
| 157 : PIX_FMT_GRAY8; | 157 : PIX_FMT_GRAY8; |
| 158 } else if (avctx->bits_per_coded_sample <= 32) { | 158 } else if (avctx->bits_per_coded_sample <= 32) { |
| 159 avctx->pix_fmt = PIX_FMT_BGR32; | 159 avctx->pix_fmt = PIX_FMT_BGR32; |
| 160 } else { | 160 } else { |
| 161 return AVERROR_INVALIDDATA; | 161 return AVERROR_INVALIDDATA; |
| 162 } | 162 } |
| 163 | 163 |
| 164 if ((err = av_check_image_size(avctx->width, avctx->height, 0, avctx))) | 164 if ((err = av_image_check_size(avctx->width, avctx->height, 0, avctx))) |
| 165 return err; | 165 return err; |
| 166 s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits t
o word-boundary | 166 s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits t
o word-boundary |
| 167 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); | 167 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); |
| 168 if (!s->planebuf) | 168 if (!s->planebuf) |
| 169 return AVERROR(ENOMEM); | 169 return AVERROR(ENOMEM); |
| 170 | 170 |
| 171 s->frame.reference = 1; | 171 s->frame.reference = 1; |
| 172 | 172 |
| 173 return 0; | 173 return 0; |
| 174 } | 174 } |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 AVMEDIA_TYPE_VIDEO, | 386 AVMEDIA_TYPE_VIDEO, |
| 387 CODEC_ID_IFF_BYTERUN1, | 387 CODEC_ID_IFF_BYTERUN1, |
| 388 sizeof(IffContext), | 388 sizeof(IffContext), |
| 389 decode_init, | 389 decode_init, |
| 390 NULL, | 390 NULL, |
| 391 decode_end, | 391 decode_end, |
| 392 decode_frame_byterun1, | 392 decode_frame_byterun1, |
| 393 CODEC_CAP_DR1, | 393 CODEC_CAP_DR1, |
| 394 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), | 394 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), |
| 395 }; | 395 }; |
| OLD | NEW |