diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavcodec/bmp.c | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavcodec/bmp.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/bmp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/ffmpeg/libavcodec/bmp.c b/contrib/ffmpeg/libavcodec/bmp.c index d1cfdce6d..35d20e6cc 100644 --- a/contrib/ffmpeg/libavcodec/bmp.c +++ b/contrib/ffmpeg/libavcodec/bmp.c @@ -34,7 +34,7 @@ static int bmp_decode_init(AVCodecContext *avctx){ static int bmp_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { BMPContext *s = avctx->priv_data; AVFrame *picture = data; @@ -48,7 +48,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, uint32_t rgb[3]; uint8_t *ptr; int dsize; - uint8_t *buf0 = buf; + const uint8_t *buf0 = buf; if(buf_size < 14){ av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size); @@ -111,7 +111,6 @@ static int bmp_decode_frame(AVCodecContext *avctx, rgb[2] = bytestream_get_le32(&buf); } - avctx->codec_id = CODEC_ID_BMP; avctx->width = width; avctx->height = height > 0? height: -height; @@ -194,7 +193,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, break; case 16: for(i = 0; i < avctx->height; i++){ - uint16_t *src = (uint16_t *) buf; + const uint16_t *src = (const uint16_t *) buf; uint16_t *dst = (uint16_t *) ptr; for(j = 0; j < avctx->width; j++) @@ -206,7 +205,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, break; case 32: for(i = 0; i < avctx->height; i++){ - uint8_t *src = buf; + const uint8_t *src = buf; uint8_t *dst = ptr; for(j = 0; j < avctx->width; j++){ |