mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 16:22:37 +00:00
const
Originally committed as revision 11712 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
b5777b942d
commit
2b3c8f8a6a
@ -1073,9 +1073,9 @@ static int valid_marker_list[] =
|
|||||||
|
|
||||||
/* return the 8 bit start code value and update the search
|
/* return the 8 bit start code value and update the search
|
||||||
state. Return -1 if no start code found */
|
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;
|
unsigned int v, v2;
|
||||||
int val;
|
int val;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
@ -1105,10 +1105,10 @@ found:
|
|||||||
|
|
||||||
int ff_mjpeg_decode_frame(AVCodecContext *avctx,
|
int ff_mjpeg_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)
|
||||||
{
|
{
|
||||||
MJpegDecodeContext *s = avctx->priv_data;
|
MJpegDecodeContext *s = avctx->priv_data;
|
||||||
uint8_t *buf_end, *buf_ptr;
|
const uint8_t *buf_end, *buf_ptr;
|
||||||
int start_code;
|
int start_code;
|
||||||
AVFrame *picture = data;
|
AVFrame *picture = data;
|
||||||
|
|
||||||
@ -1136,7 +1136,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
|
|||||||
/* unescape buffer of SOS, use special treatment for JPEG-LS */
|
/* unescape buffer of SOS, use special treatment for JPEG-LS */
|
||||||
if (start_code == SOS && !s->ls)
|
if (start_code == SOS && !s->ls)
|
||||||
{
|
{
|
||||||
uint8_t *src = buf_ptr;
|
const uint8_t *src = buf_ptr;
|
||||||
uint8_t *dst = s->buffer;
|
uint8_t *dst = s->buffer;
|
||||||
|
|
||||||
while (src<buf_end)
|
while (src<buf_end)
|
||||||
@ -1163,7 +1163,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
|
|||||||
(buf_end - buf_ptr) - (dst - s->buffer));
|
(buf_end - buf_ptr) - (dst - s->buffer));
|
||||||
}
|
}
|
||||||
else if(start_code == SOS && s->ls){
|
else if(start_code == SOS && s->ls){
|
||||||
uint8_t *src = buf_ptr;
|
const uint8_t *src = buf_ptr;
|
||||||
uint8_t *dst = s->buffer;
|
uint8_t *dst = s->buffer;
|
||||||
int bit_count = 0;
|
int bit_count = 0;
|
||||||
int t = 0, b = 0;
|
int t = 0, b = 0;
|
||||||
|
@ -103,7 +103,7 @@ int ff_mjpeg_decode_init(AVCodecContext *avctx);
|
|||||||
int ff_mjpeg_decode_end(AVCodecContext *avctx);
|
int ff_mjpeg_decode_end(AVCodecContext *avctx);
|
||||||
int ff_mjpeg_decode_frame(AVCodecContext *avctx,
|
int ff_mjpeg_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);
|
||||||
int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
|
int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
|
||||||
int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
|
int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
|
||||||
int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
|
int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
|
||||||
|
Loading…
Reference in New Issue
Block a user