diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/msrle.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/msrle.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/contrib/ffmpeg/libavcodec/msrle.c b/contrib/ffmpeg/libavcodec/msrle.c index fae5616e5..51893cbb7 100644 --- a/contrib/ffmpeg/libavcodec/msrle.c +++ b/contrib/ffmpeg/libavcodec/msrle.c @@ -36,7 +36,6 @@ #include <string.h> #include <unistd.h> -#include "common.h" #include "avcodec.h" #include "dsputil.h" @@ -44,7 +43,7 @@ typedef struct MsrleContext { AVCodecContext *avctx; AVFrame frame; - unsigned char *buf; + const unsigned char *buf; int size; } MsrleContext; @@ -239,12 +238,11 @@ static void msrle_decode_pal8(MsrleContext *s) static int msrle_decode_init(AVCodecContext *avctx) { - MsrleContext *s = (MsrleContext *)avctx->priv_data; + MsrleContext *s = avctx->priv_data; s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; s->frame.data[0] = NULL; return 0; @@ -252,9 +250,9 @@ static int msrle_decode_init(AVCodecContext *avctx) static int msrle_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { - MsrleContext *s = (MsrleContext *)avctx->priv_data; + MsrleContext *s = avctx->priv_data; s->buf = buf; s->size = buf_size; @@ -287,7 +285,7 @@ static int msrle_decode_frame(AVCodecContext *avctx, static int msrle_decode_end(AVCodecContext *avctx) { - MsrleContext *s = (MsrleContext *)avctx->priv_data; + MsrleContext *s = avctx->priv_data; /* release the last frame */ if (s->frame.data[0]) |