* Copyright (c) 2010 Peter Ross <pross@xvid.org>
* Copyright (c) 2010 Sebastian Vater <cdgs.basty@googlemail.com>
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* IFF PBM/ILBM bitmap decoder
*/
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "bytestream.h"
#include "avcodec.h"
#include "get_bits.h"
-#include "iff.h"
typedef struct {
AVFrame frame;
/**
* Convert CMAP buffer (stored in extradata) to lavc palette format
*/
-int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
+static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{
int count, i;
return 0;
}
-AVCodec iff_ilbm_decoder = {
- "iff_ilbm",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_IFF_ILBM,
- sizeof(IffContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame_ilbm,
- CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
+AVCodec ff_iff_ilbm_decoder = {
+ .name = "iff_ilbm",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_IFF_ILBM,
+ .priv_data_size = sizeof(IffContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame_ilbm,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
};
-AVCodec iff_byterun1_decoder = {
- "iff_byterun1",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_IFF_BYTERUN1,
- sizeof(IffContext),
- decode_init,
- NULL,
- decode_end,
- decode_frame_byterun1,
- CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
+AVCodec ff_iff_byterun1_decoder = {
+ .name = "iff_byterun1",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_IFF_BYTERUN1,
+ .priv_data_size = sizeof(IffContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame_byterun1,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
};