Commit c27fc644 authored by Michael Niedermayer's avatar Michael Niedermayer

const

Originally committed as revision 11727 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c82fbf7f
...@@ -127,7 +127,7 @@ static int flic_decode_init(AVCodecContext *avctx) ...@@ -127,7 +127,7 @@ static int flic_decode_init(AVCodecContext *avctx)
static int flic_decode_frame_8BPP(AVCodecContext *avctx, static int flic_decode_frame_8BPP(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
FlicDecodeContext *s = avctx->priv_data; FlicDecodeContext *s = avctx->priv_data;
...@@ -427,7 +427,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, ...@@ -427,7 +427,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
/* Note, the only difference between the 15Bpp and 16Bpp */ /* Note, the only difference between the 15Bpp and 16Bpp */
/* Format is the pixel format, the packets are processed the same. */ /* Format is the pixel format, the packets are processed the same. */
...@@ -692,7 +692,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, ...@@ -692,7 +692,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
static int flic_decode_frame_24BPP(AVCodecContext *avctx, static int flic_decode_frame_24BPP(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n"); av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n");
return -1; return -1;
...@@ -700,7 +700,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx, ...@@ -700,7 +700,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx,
static int flic_decode_frame(AVCodecContext *avctx, static int flic_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
if (avctx->pix_fmt == PIX_FMT_PAL8) { if (avctx->pix_fmt == PIX_FMT_PAL8) {
return flic_decode_frame_8BPP(avctx, data, data_size, return flic_decode_frame_8BPP(avctx, data, data_size,
......
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