[FFmpeg-cvslog] r11712 - in trunk/libavcodec: mjpegdec.c mjpegdec.h
michael
subversion
Fri Feb 1 04:40:46 CET 2008
Author: michael
Date: Fri Feb 1 04:40:46 2008
New Revision: 11712
Log:
const
Modified:
trunk/libavcodec/mjpegdec.c
trunk/libavcodec/mjpegdec.h
Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c (original)
+++ trunk/libavcodec/mjpegdec.c Fri Feb 1 04:40:46 2008
@@ -1073,9 +1073,9 @@ static int valid_marker_list[] =
/* return the 8 bit start code value and update the search
state. Return -1 if no start code found */
-static int find_marker(uint8_t **pbuf_ptr, uint8_t *buf_end)
+static int find_marker(const uint8_t **pbuf_ptr, const uint8_t *buf_end)
{
- uint8_t *buf_ptr;
+ const uint8_t *buf_ptr;
unsigned int v, v2;
int val;
#ifdef DEBUG
@@ -1105,10 +1105,10 @@ found:
int ff_mjpeg_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
MJpegDecodeContext *s = avctx->priv_data;
- uint8_t *buf_end, *buf_ptr;
+ const uint8_t *buf_end, *buf_ptr;
int start_code;
AVFrame *picture = data;
@@ -1136,7 +1136,7 @@ int ff_mjpeg_decode_frame(AVCodecContext
/* unescape buffer of SOS, use special treatment for JPEG-LS */
if (start_code == SOS && !s->ls)
{
- uint8_t *src = buf_ptr;
+ const uint8_t *src = buf_ptr;
uint8_t *dst = s->buffer;
while (src<buf_end)
@@ -1163,7 +1163,7 @@ int ff_mjpeg_decode_frame(AVCodecContext
(buf_end - buf_ptr) - (dst - s->buffer));
}
else if(start_code == SOS && s->ls){
- uint8_t *src = buf_ptr;
+ const uint8_t *src = buf_ptr;
uint8_t *dst = s->buffer;
int bit_count = 0;
int t = 0, b = 0;
Modified: trunk/libavcodec/mjpegdec.h
==============================================================================
--- trunk/libavcodec/mjpegdec.h (original)
+++ trunk/libavcodec/mjpegdec.h Fri Feb 1 04:40:46 2008
@@ -103,7 +103,7 @@ int ff_mjpeg_decode_init(AVCodecContext
int ff_mjpeg_decode_end(AVCodecContext *avctx);
int ff_mjpeg_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size);
+ const uint8_t *buf, int buf_size);
int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
More information about the ffmpeg-cvslog
mailing list