[FFmpeg-cvslog] r11708 - in trunk/libavcodec: bytestream.h dnxhdenc.c dpcm.c dsicinav.c dsputil.c dv.c dvbsubdec.c dvdsubdec.c gifdec.c idcinvideo.c imc.c indeo2.c indeo3.c interplayvideo.c kmvc.c lcldec.c loco.c lzw.c lzw.h mmvideo.c mpc7.c mpc8.c mpegaudiodec.c msrle.c msvideo1.c nellymoserdec.c nuv.c pcm.c roqvideodec.c sgidec.c ulti.c vb.c xsubdec.c
michael
subversion
Fri Feb 1 04:26:31 CET 2008
Author: michael
Date: Fri Feb 1 04:26:31 2008
New Revision: 11708
Log:
consts
I have underestimated this a little, and these are just some ...
Modified:
trunk/libavcodec/bytestream.h
trunk/libavcodec/dnxhdenc.c
trunk/libavcodec/dpcm.c
trunk/libavcodec/dsicinav.c
trunk/libavcodec/dsputil.c
trunk/libavcodec/dv.c
trunk/libavcodec/dvbsubdec.c
trunk/libavcodec/dvdsubdec.c
trunk/libavcodec/gifdec.c
trunk/libavcodec/idcinvideo.c
trunk/libavcodec/imc.c
trunk/libavcodec/indeo2.c
trunk/libavcodec/indeo3.c
trunk/libavcodec/interplayvideo.c
trunk/libavcodec/kmvc.c
trunk/libavcodec/lcldec.c
trunk/libavcodec/loco.c
trunk/libavcodec/lzw.c
trunk/libavcodec/lzw.h
trunk/libavcodec/mmvideo.c
trunk/libavcodec/mpc7.c
trunk/libavcodec/mpc8.c
trunk/libavcodec/mpegaudiodec.c
trunk/libavcodec/msrle.c
trunk/libavcodec/msvideo1.c
trunk/libavcodec/nellymoserdec.c
trunk/libavcodec/nuv.c
trunk/libavcodec/pcm.c
trunk/libavcodec/roqvideodec.c
trunk/libavcodec/sgidec.c
trunk/libavcodec/ulti.c
trunk/libavcodec/vb.c
trunk/libavcodec/xsubdec.c
Modified: trunk/libavcodec/bytestream.h
==============================================================================
--- trunk/libavcodec/bytestream.h (original)
+++ trunk/libavcodec/bytestream.h Fri Feb 1 04:26:31 2008
@@ -25,7 +25,7 @@
#include "common.h"
#define DEF_T(type, name, bytes, read, write) \
-static av_always_inline type bytestream_get_ ## name(uint8_t **b){\
+static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
(*b) += bytes;\
return read(*b - bytes);\
}\
@@ -53,7 +53,7 @@ DEF (byte, 1, AV_RB8 , AV_WB8 )
#undef DEF64
#undef DEF_T
-static av_always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t *dst, unsigned int size)
+static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, uint8_t *dst, unsigned int size)
{
memcpy(dst, *b, size);
(*b) += size;
Modified: trunk/libavcodec/dnxhdenc.c
==============================================================================
--- trunk/libavcodec/dnxhdenc.c (original)
+++ trunk/libavcodec/dnxhdenc.c Fri Feb 1 04:26:31 2008
@@ -693,7 +693,7 @@ static int dnxhd_find_qscale(DNXHDEncCon
static int dnxhd_rc_cmp(const void *a, const void *b)
{
- return ((RCCMPEntry *)b)->value - ((RCCMPEntry *)a)->value;
+ return ((const RCCMPEntry *)b)->value - ((const RCCMPEntry *)a)->value;
}
static int dnxhd_encode_fast(AVCodecContext *avctx, DNXHDEncContext *ctx)
@@ -733,7 +733,7 @@ static int dnxhd_encode_fast(AVCodecCont
return 0;
}
-static void dnxhd_load_picture(DNXHDEncContext *ctx, AVFrame *frame)
+static void dnxhd_load_picture(DNXHDEncContext *ctx, const AVFrame *frame)
{
int i;
@@ -753,7 +753,7 @@ static void dnxhd_load_picture(DNXHDEncC
ctx->cur_field = frame->interlaced_frame && !frame->top_field_first;
}
-static int dnxhd_encode_picture(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data)
+static int dnxhd_encode_picture(AVCodecContext *avctx, unsigned char *buf, int buf_size, const void *data)
{
DNXHDEncContext *ctx = avctx->priv_data;
int first_field = 1;
Modified: trunk/libavcodec/dpcm.c
==============================================================================
--- trunk/libavcodec/dpcm.c (original)
+++ trunk/libavcodec/dpcm.c Fri Feb 1 04:26:31 2008
@@ -159,7 +159,7 @@ static int dpcm_decode_init(AVCodecConte
static int dpcm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DPCMContext *s = avctx->priv_data;
int in, out = 0;
Modified: trunk/libavcodec/dsicinav.c
==============================================================================
--- trunk/libavcodec/dsicinav.c (original)
+++ trunk/libavcodec/dsicinav.c Fri Feb 1 04:26:31 2008
@@ -195,7 +195,7 @@ static void cin_decode_rle(const unsigne
static int cinvideo_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
CinVideoContext *cin = avctx->priv_data;
int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size;
@@ -311,10 +311,10 @@ static int cinaudio_decode_init(AVCodecC
static int cinaudio_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
CinAudioContext *cin = avctx->priv_data;
- uint8_t *src = buf;
+ const uint8_t *src = buf;
int16_t *samples = (int16_t *)data;
buf_size = FFMIN(buf_size, *data_size/2);
Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c (original)
+++ trunk/libavcodec/dsputil.c Fri Feb 1 04:26:31 2008
@@ -3785,7 +3785,7 @@ void ff_vector_fmul_add_add_c(float *dst
void ff_float_to_int16_c(int16_t *dst, const float *src, int len){
int i;
for(i=0; i<len; i++) {
- int_fast32_t tmp = ((int32_t*)src)[i];
+ int_fast32_t tmp = ((const int32_t*)src)[i];
if(tmp & 0xf0000){
tmp = (0x43c0ffff - tmp)>>31;
// is this faster on some gcc/cpu combinations?
Modified: trunk/libavcodec/dv.c
==============================================================================
--- trunk/libavcodec/dv.c (original)
+++ trunk/libavcodec/dv.c Fri Feb 1 04:26:31 2008
@@ -1031,7 +1031,7 @@ static int dv_encode_mt(AVCodecContext *
144000 bytes for PAL - or twice those for 50Mbps) */
static int dvvideo_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DVVideoContext *s = avctx->priv_data;
Modified: trunk/libavcodec/dvbsubdec.c
==============================================================================
--- trunk/libavcodec/dvbsubdec.c (original)
+++ trunk/libavcodec/dvbsubdec.c Fri Feb 1 04:26:31 2008
@@ -429,7 +429,7 @@ static int dvbsub_close_decoder(AVCodecC
}
static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len,
- uint8_t **srcbuf, int buf_size,
+ const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table)
{
GetBitContext gb;
@@ -534,7 +534,7 @@ static int dvbsub_read_2bit_string(uint8
}
static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len,
- uint8_t **srcbuf, int buf_size,
+ const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table)
{
GetBitContext gb;
@@ -655,10 +655,10 @@ static int dvbsub_read_4bit_string(uint8
}
static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
- uint8_t **srcbuf, int buf_size,
+ const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table)
{
- uint8_t *sbuf_end = (*srcbuf) + buf_size;
+ const uint8_t *sbuf_end = (*srcbuf) + buf_size;
int bits;
int run_length;
int pixels_read = 0;
@@ -714,12 +714,12 @@ static int dvbsub_read_8bit_string(uint8
static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display,
- uint8_t *buf, int buf_size, int top_bottom, int non_mod)
+ const uint8_t *buf, int buf_size, int top_bottom, int non_mod)
{
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
DVBSubRegion *region = get_region(ctx, display->region_id);
- uint8_t *buf_end = buf + buf_size;
+ const uint8_t *buf_end = buf + buf_size;
uint8_t *pbuf;
int x_pos, y_pos;
int i;
@@ -833,12 +833,12 @@ static void dvbsub_parse_pixel_data_bloc
}
static void dvbsub_parse_object_segment(AVCodecContext *avctx,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
- uint8_t *buf_end = buf + buf_size;
- uint8_t *block;
+ const uint8_t *buf_end = buf + buf_size;
+ const uint8_t *block;
int object_id;
DVBSubObject *object;
DVBSubObjectDisplay *display;
@@ -892,11 +892,11 @@ static void dvbsub_parse_object_segment(
}
static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
- uint8_t *buf_end = buf + buf_size;
+ const uint8_t *buf_end = buf + buf_size;
int clut_id;
DVBSubCLUT *clut;
int entry_id, depth , full_range;
@@ -982,11 +982,11 @@ static void dvbsub_parse_clut_segment(AV
static void dvbsub_parse_region_segment(AVCodecContext *avctx,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
- uint8_t *buf_end = buf + buf_size;
+ const uint8_t *buf_end = buf + buf_size;
int region_id, object_id;
DVBSubRegion *region;
DVBSubObject *object;
@@ -1098,13 +1098,13 @@ static void dvbsub_parse_region_segment(
}
static void dvbsub_parse_page_segment(AVCodecContext *avctx,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
DVBSubRegionDisplay *display;
DVBSubRegionDisplay *tmp_display_list, **tmp_ptr;
- uint8_t *buf_end = buf + buf_size;
+ const uint8_t *buf_end = buf + buf_size;
int region_id;
int page_state;
@@ -1265,7 +1265,7 @@ static void save_display_set(DVBSubConte
}
#endif
-static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf,
+static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
int buf_size, AVSubtitle *sub)
{
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
@@ -1341,11 +1341,11 @@ static int dvbsub_display_end_segment(AV
static int dvbsub_decode(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
AVSubtitle *sub = (AVSubtitle*) data;
- uint8_t *p, *p_end;
+ const uint8_t *p, *p_end;
int segment_type;
int page_id;
int segment_length;
Modified: trunk/libavcodec/dvdsubdec.c
==============================================================================
--- trunk/libavcodec/dvdsubdec.c (original)
+++ trunk/libavcodec/dvdsubdec.c Fri Feb 1 04:26:31 2008
@@ -469,7 +469,7 @@ static void ppm_save(const char *filenam
static int dvdsub_decode(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
AVSubtitle *sub = (void *)data;
int is_menu;
Modified: trunk/libavcodec/gifdec.c
==============================================================================
--- trunk/libavcodec/gifdec.c (original)
+++ trunk/libavcodec/gifdec.c Fri Feb 1 04:26:31 2008
@@ -47,8 +47,8 @@ typedef struct GifState {
int gce_delay;
/* LZW compatible decoder */
- uint8_t *bytestream;
- uint8_t *bytestream_end;
+ const uint8_t *bytestream;
+ const uint8_t *bytestream_end;
LZWState *lzw;
/* aux buffers */
@@ -285,7 +285,7 @@ static int gif_decode_init(AVCodecContex
return 0;
}
-static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
+static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
{
GifState *s = avctx->priv_data;
AVFrame *picture = data;
Modified: trunk/libavcodec/idcinvideo.c
==============================================================================
--- trunk/libavcodec/idcinvideo.c (original)
+++ trunk/libavcodec/idcinvideo.c Fri Feb 1 04:26:31 2008
@@ -69,7 +69,7 @@ typedef struct IdcinContext {
DSPContext dsp;
AVFrame frame;
- unsigned char *buf;
+ const unsigned char *buf;
int size;
hnode_t huff_nodes[256][HUF_TOKENS*2];
@@ -212,7 +212,7 @@ static void idcin_decode_vlcs(IdcinConte
static int idcin_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
IdcinContext *s = avctx->priv_data;
AVPaletteControl *palette_control = avctx->palctrl;
Modified: trunk/libavcodec/imc.c
==============================================================================
--- trunk/libavcodec/imc.c (original)
+++ trunk/libavcodec/imc.c Fri Feb 1 04:26:31 2008
@@ -625,7 +625,7 @@ static int imc_get_coeffs (IMCContext* q
static int imc_decode_frame(AVCodecContext * avctx,
void *data, int *data_size,
- uint8_t * buf, int buf_size)
+ const uint8_t * buf, int buf_size)
{
IMCContext *q = avctx->priv_data;
Modified: trunk/libavcodec/indeo2.c
==============================================================================
--- trunk/libavcodec/indeo2.c (original)
+++ trunk/libavcodec/indeo2.c Fri Feb 1 04:26:31 2008
@@ -136,7 +136,7 @@ static int ir2_decode_plane_inter(Ir2Con
static int ir2_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
Ir2Context * const s = avctx->priv_data;
AVFrame *picture = data;
Modified: trunk/libavcodec/indeo3.c
==============================================================================
--- trunk/libavcodec/indeo3.c (original)
+++ trunk/libavcodec/indeo3.c Fri Feb 1 04:26:31 2008
@@ -176,12 +176,12 @@ static void iv_free_func(Indeo3DecodeCon
/* ---------------------------------------------------------------------- */
static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
- unsigned char *buf, int buf_size)
+ const unsigned char *buf, int buf_size)
{
unsigned int hdr_width, hdr_height,
chroma_width, chroma_height;
unsigned long fflags1, fflags2, fflags3, offs1, offs2, offs3, offs;
- unsigned char *hdr_pos, *buf_pos;
+ const unsigned char *hdr_pos, *buf_pos;
buf_pos = buf;
buf_pos += 18;
@@ -1074,7 +1074,7 @@ static int indeo3_decode_init(AVCodecCon
static int indeo3_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- unsigned char *buf, int buf_size)
+ const unsigned char *buf, int buf_size)
{
Indeo3DecodeContext *s=avctx->priv_data;
unsigned char *src, *dest;
Modified: trunk/libavcodec/interplayvideo.c
==============================================================================
--- trunk/libavcodec/interplayvideo.c (original)
+++ trunk/libavcodec/interplayvideo.c Fri Feb 1 04:26:31 2008
@@ -60,14 +60,14 @@ typedef struct IpvideoContext {
AVFrame second_last_frame;
AVFrame last_frame;
AVFrame current_frame;
- unsigned char *decoding_map;
+ const unsigned char *decoding_map;
int decoding_map_size;
- unsigned char *buf;
+ const unsigned char *buf;
int size;
- unsigned char *stream_ptr;
- unsigned char *stream_end;
+ const unsigned char *stream_ptr;
+ const unsigned char *stream_end;
unsigned char *pixel_ptr;
int line_inc;
int stride;
@@ -879,7 +879,7 @@ static int ipvideo_decode_init(AVCodecCo
static int ipvideo_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
IpvideoContext *s = avctx->priv_data;
AVPaletteControl *palette_control = avctx->palctrl;
Modified: trunk/libavcodec/kmvc.c
==============================================================================
--- trunk/libavcodec/kmvc.c (original)
+++ trunk/libavcodec/kmvc.c Fri Feb 1 04:26:31 2008
@@ -67,7 +67,7 @@ typedef struct BitBuf {
} \
}
-static void kmvc_decode_intra_8x8(KmvcContext * ctx, uint8_t * src, int w, int h)
+static void kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int w, int h)
{
BitBuf bb;
int res, val;
@@ -142,7 +142,7 @@ static void kmvc_decode_intra_8x8(KmvcCo
}
}
-static void kmvc_decode_inter_8x8(KmvcContext * ctx, uint8_t * src, int w, int h)
+static void kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int w, int h)
{
BitBuf bb;
int res, val;
@@ -224,7 +224,7 @@ static void kmvc_decode_inter_8x8(KmvcCo
}
}
-static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, uint8_t * buf,
+static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, const uint8_t * buf,
int buf_size)
{
KmvcContext *const ctx = avctx->priv_data;
Modified: trunk/libavcodec/lcldec.c
==============================================================================
--- trunk/libavcodec/lcldec.c (original)
+++ trunk/libavcodec/lcldec.c Fri Feb 1 04:26:31 2008
@@ -161,7 +161,7 @@ static unsigned int mszh_decomp(unsigned
* Decode a frame
*
*/
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
{
LclDecContext * const c = avctx->priv_data;
unsigned char *encoded = (unsigned char *)buf;
Modified: trunk/libavcodec/loco.c
==============================================================================
--- trunk/libavcodec/loco.c (original)
+++ trunk/libavcodec/loco.c Fri Feb 1 04:26:31 2008
@@ -116,7 +116,7 @@ static inline int loco_predict(uint8_t*
}
static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int height,
- int stride, uint8_t *buf, int buf_size, int step)
+ int stride, const uint8_t *buf, int buf_size, int step)
{
RICEContext rc;
int val;
@@ -157,7 +157,7 @@ static int loco_decode_plane(LOCOContext
static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
LOCOContext * const l = avctx->priv_data;
AVFrame * const p= (AVFrame*)&l->pic;
Modified: trunk/libavcodec/lzw.c
==============================================================================
--- trunk/libavcodec/lzw.c (original)
+++ trunk/libavcodec/lzw.c Fri Feb 1 04:26:31 2008
@@ -42,7 +42,7 @@ static const uint16_t mask[17] =
};
struct LZWState {
- uint8_t *pbuf, *ebuf;
+ const uint8_t *pbuf, *ebuf;
int bbits;
unsigned int bbuf;
@@ -91,7 +91,7 @@ static int lzw_get_code(struct LZWState
return c & s->curmask;
}
-uint8_t* ff_lzw_cur_ptr(LZWState *p)
+const uint8_t* ff_lzw_cur_ptr(LZWState *p)
{
return ((struct LZWState*)p)->pbuf;
}
@@ -127,7 +127,7 @@ void ff_lzw_decode_close(LZWState **p)
* @param buf_size input data size
* @param mode decoder working mode - either GIF or TIFF
*/
-int ff_lzw_decode_init(LZWState *p, int csize, uint8_t *buf, int buf_size, int mode)
+int ff_lzw_decode_init(LZWState *p, int csize, const uint8_t *buf, int buf_size, int mode)
{
struct LZWState *s = (struct LZWState *)p;
Modified: trunk/libavcodec/lzw.h
==============================================================================
--- trunk/libavcodec/lzw.h (original)
+++ trunk/libavcodec/lzw.h Fri Feb 1 04:26:31 2008
@@ -43,9 +43,9 @@ typedef void LZWState;
/* first two functions de/allocate memory for LZWState */
void ff_lzw_decode_open(LZWState **p);
void ff_lzw_decode_close(LZWState **p);
-int ff_lzw_decode_init(LZWState *s, int csize, uint8_t *buf, int buf_size, int mode);
+int ff_lzw_decode_init(LZWState *s, int csize, const uint8_t *buf, int buf_size, int mode);
int ff_lzw_decode(LZWState *s, uint8_t *buf, int len);
-uint8_t* ff_lzw_cur_ptr(LZWState *lzw);
+const uint8_t* ff_lzw_cur_ptr(LZWState *lzw);
void ff_lzw_decode_tail(LZWState *lzw);
/** LZW encode state */
Modified: trunk/libavcodec/mmvideo.c
==============================================================================
--- trunk/libavcodec/mmvideo.c (original)
+++ trunk/libavcodec/mmvideo.c Fri Feb 1 04:26:31 2008
@@ -150,7 +150,7 @@ static void mm_decode_inter(MmContext *
static int mm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
MmContext *s = avctx->priv_data;
AVPaletteControl *palette_control = avctx->palctrl;
Modified: trunk/libavcodec/mpc7.c
==============================================================================
--- trunk/libavcodec/mpc7.c (original)
+++ trunk/libavcodec/mpc7.c Fri Feb 1 04:26:31 2008
@@ -158,7 +158,7 @@ static inline void idx_to_quant(MPCConte
static int mpc7_decode_frame(AVCodecContext * avctx,
void *data, int *data_size,
- uint8_t * buf, int buf_size)
+ const uint8_t * buf, int buf_size)
{
MPCContext *c = avctx->priv_data;
GetBitContext gb;
Modified: trunk/libavcodec/mpc8.c
==============================================================================
--- trunk/libavcodec/mpc8.c (original)
+++ trunk/libavcodec/mpc8.c Fri Feb 1 04:26:31 2008
@@ -182,7 +182,7 @@ static int mpc8_decode_init(AVCodecConte
static int mpc8_decode_frame(AVCodecContext * avctx,
void *data, int *data_size,
- uint8_t * buf, int buf_size)
+ const uint8_t * buf, int buf_size)
{
MPCContext *c = avctx->priv_data;
GetBitContext gb2, *gb = &gb2;
Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c (original)
+++ trunk/libavcodec/mpegaudiodec.c Fri Feb 1 04:26:31 2008
@@ -2367,7 +2367,7 @@ static int mp_decode_frame(MPADecodeCont
static int decode_frame(AVCodecContext * avctx,
void *data, int *data_size,
- uint8_t * buf, int buf_size)
+ const uint8_t * buf, int buf_size)
{
MPADecodeContext *s = avctx->priv_data;
uint32_t header;
@@ -2438,7 +2438,7 @@ static void flush(AVCodecContext *avctx)
#ifdef CONFIG_MP3ADU_DECODER
static int decode_frame_adu(AVCodecContext * avctx,
void *data, int *data_size,
- uint8_t * buf, int buf_size)
+ const uint8_t * buf, int buf_size)
{
MPADecodeContext *s = avctx->priv_data;
uint32_t header;
@@ -2564,7 +2564,7 @@ static int decode_close_mp3on4(AVCodecCo
static int decode_frame_mp3on4(AVCodecContext * avctx,
void *data, int *data_size,
- uint8_t * buf, int buf_size)
+ const uint8_t * buf, int buf_size)
{
MP3On4DecodeContext *s = avctx->priv_data;
MPADecodeContext *m;
@@ -2574,7 +2574,7 @@ static int decode_frame_mp3on4(AVCodecCo
OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS];
OUT_INT *outptr, *bp;
int fsize;
- unsigned char *start2 = buf, *start;
+ const unsigned char *start2 = buf, *start;
int fr, i, j, n;
int off = avctx->channels;
int *coff = chan_offset[s->chan_cfg];
Modified: trunk/libavcodec/msrle.c
==============================================================================
--- trunk/libavcodec/msrle.c (original)
+++ trunk/libavcodec/msrle.c Fri Feb 1 04:26:31 2008
@@ -43,7 +43,7 @@ typedef struct MsrleContext {
AVCodecContext *avctx;
AVFrame frame;
- unsigned char *buf;
+ const unsigned char *buf;
int size;
} MsrleContext;
@@ -250,7 +250,7 @@ static int msrle_decode_init(AVCodecCont
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 = avctx->priv_data;
Modified: trunk/libavcodec/msvideo1.c
==============================================================================
--- trunk/libavcodec/msvideo1.c (original)
+++ trunk/libavcodec/msvideo1.c Fri Feb 1 04:26:31 2008
@@ -52,7 +52,7 @@ typedef struct Msvideo1Context {
DSPContext dsp;
AVFrame frame;
- unsigned char *buf;
+ const unsigned char *buf;
int size;
int mode_8bit; /* if it's not 8-bit, it's 16-bit */
@@ -297,7 +297,7 @@ static void msvideo1_decode_16bit(Msvide
static int msvideo1_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
Msvideo1Context *s = avctx->priv_data;
Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c (original)
+++ trunk/libavcodec/nellymoserdec.c Fri Feb 1 04:26:31 2008
@@ -274,7 +274,7 @@ static void get_sample_bits(const float
}
}
-void nelly_decode_block(NellyMoserDecodeContext *s, unsigned char block[NELLY_BLOCK_LEN], float audio[NELLY_SAMPLES])
+void nelly_decode_block(NellyMoserDecodeContext *s, const unsigned char block[NELLY_BLOCK_LEN], float audio[NELLY_SAMPLES])
{
int i,j;
float buf[NELLY_FILL_LEN], pows[NELLY_FILL_LEN];
@@ -358,7 +358,7 @@ static int decode_init(AVCodecContext *
static int decode_tag(AVCodecContext * avctx,
void *data, int *data_size,
- uint8_t * buf, int buf_size) {
+ const uint8_t * buf, int buf_size) {
NellyMoserDecodeContext *s = avctx->priv_data;
int blocks, i;
int16_t* samples;
Modified: trunk/libavcodec/nuv.c
==============================================================================
--- trunk/libavcodec/nuv.c (original)
+++ trunk/libavcodec/nuv.c Fri Feb 1 04:26:31 2008
@@ -129,7 +129,7 @@ static int codec_reinit(AVCodecContext *
}
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- uint8_t *buf, int buf_size) {
+ const uint8_t *buf, int buf_size) {
NuvContext *c = avctx->priv_data;
AVFrame *picture = data;
int orig_size = buf_size;
Modified: trunk/libavcodec/pcm.c
==============================================================================
--- trunk/libavcodec/pcm.c (original)
+++ trunk/libavcodec/pcm.c Fri Feb 1 04:26:31 2008
@@ -355,7 +355,7 @@ static int pcm_decode_init(AVCodecContex
* \param src_len number of bytes in src
*/
static inline void decode_to16(int bps, int le, int us,
- uint8_t **src, short **samples, int src_len)
+ const uint8_t **src, short **samples, int src_len)
{
int usum = us ? -0x8000 : 0;
register int n = src_len / bps;
@@ -373,12 +373,12 @@ static inline void decode_to16(int bps,
static int pcm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
PCMDecode *s = avctx->priv_data;
int c, n;
short *samples;
- uint8_t *src, *src2[MAX_CHANNELS];
+ const uint8_t *src, *src2[MAX_CHANNELS];
samples = data;
src = buf;
Modified: trunk/libavcodec/roqvideodec.c
==============================================================================
--- trunk/libavcodec/roqvideodec.c (original)
+++ trunk/libavcodec/roqvideodec.c Fri Feb 1 04:26:31 2008
@@ -43,7 +43,7 @@ static void roqvideo_decode_frame(RoqCon
int vqid, bpos, xpos, ypos, xp, yp, x, y, mx, my;
int frame_stats[2][4] = {{0},{0}};
roq_qcell *qcell;
- unsigned char *buf = ri->buf;
+ const unsigned char *buf = ri->buf;
unsigned char *buf_end = ri->buf + ri->size;
while (buf < buf_end) {
Modified: trunk/libavcodec/sgidec.c
==============================================================================
--- trunk/libavcodec/sgidec.c (original)
+++ trunk/libavcodec/sgidec.c Fri Feb 1 04:26:31 2008
@@ -40,7 +40,7 @@ typedef struct SgiState {
* @param pixelstride pixel stride of input buffer
* @return size of output in bytes, -1 if buffer overflows
*/
-static int expand_rle_row(uint8_t *in_buf, uint8_t* in_end,
+static int expand_rle_row(const uint8_t *in_buf, const uint8_t* in_end,
unsigned char *out_buf, uint8_t* out_end, int pixelstride)
{
unsigned char pixel, count;
@@ -80,12 +80,12 @@ static int expand_rle_row(uint8_t *in_bu
* @param s the current image state
* @return 0 if no error, else return error number.
*/
-static int read_rle_sgi(unsigned char* out_buf, uint8_t *in_buf,
- uint8_t *in_end, SgiState* s)
+static int read_rle_sgi(unsigned char* out_buf, const uint8_t *in_buf,
+ const uint8_t *in_end, SgiState* s)
{
uint8_t *dest_row;
unsigned int len = s->height * s->depth * 4;
- uint8_t *start_table = in_buf;
+ const uint8_t *start_table = in_buf;
unsigned int y, z;
unsigned int start_offset;
@@ -121,10 +121,10 @@ static int read_rle_sgi(unsigned char* o
* @return 0 if read success, otherwise return -1.
*/
static int read_uncompressed_sgi(unsigned char* out_buf, uint8_t* out_end,
- uint8_t *in_buf, uint8_t *in_end, SgiState* s)
+ const uint8_t *in_buf, const uint8_t *in_end, SgiState* s)
{
int x, y, z;
- uint8_t *ptr;
+ const uint8_t *ptr;
unsigned int offset = s->height * s->width;
/* Test buffer size. */
@@ -147,12 +147,12 @@ static int read_uncompressed_sgi(unsigne
static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *in_buf, int buf_size)
+ const uint8_t *in_buf, int buf_size)
{
SgiState *s = avctx->priv_data;
AVFrame *picture = data;
AVFrame *p = &s->picture;
- uint8_t *in_end = in_buf + buf_size;
+ const uint8_t *in_end = in_buf + buf_size;
unsigned int dimension, bytes_per_channel, rle;
int ret = 0;
uint8_t *out_buf, *out_end;
Modified: trunk/libavcodec/ulti.c
==============================================================================
--- trunk/libavcodec/ulti.c (original)
+++ trunk/libavcodec/ulti.c Fri Feb 1 04:26:31 2008
@@ -200,7 +200,7 @@ static void ulti_grad(AVFrame *frame, in
static int ulti_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
UltimotionDecodeContext *s=avctx->priv_data;
int modifier = 0;
Modified: trunk/libavcodec/vb.c
==============================================================================
--- trunk/libavcodec/vb.c (original)
+++ trunk/libavcodec/vb.c Fri Feb 1 04:26:31 2008
@@ -44,7 +44,7 @@ typedef struct VBDecContext {
uint8_t *frame, *prev_frame;
uint32_t pal[256];
- uint8_t *stream;
+ const uint8_t *stream;
} VBDecContext;
static const uint16_t vb_patterns[64] = {
@@ -82,7 +82,7 @@ static inline int check_line(uint8_t *bu
return buf >= start && (buf + 4) <= end;
}
-static int vb_decode_framedata(VBDecContext *c, uint8_t *buf, int offset)
+static int vb_decode_framedata(VBDecContext *c, const uint8_t *buf, int offset)
{
uint8_t *prev, *cur;
int blk, blocks, t, blk2;
@@ -173,7 +173,7 @@ static int vb_decode_framedata(VBDecCont
return 0;
}
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
{
VBDecContext * const c = avctx->priv_data;
uint8_t *outptr, *srcptr;
Modified: trunk/libavcodec/xsubdec.c
==============================================================================
--- trunk/libavcodec/xsubdec.c (original)
+++ trunk/libavcodec/xsubdec.c Fri Feb 1 04:26:31 2008
@@ -30,7 +30,7 @@ static int decode_init(AVCodecContext *a
static const uint8_t tc_offsets[9] = { 0, 1, 3, 4, 6, 7, 9, 10, 11 };
static const uint8_t tc_muls[9] = { 10, 6, 10, 6, 10, 6, 10, 10, 1 };
-static uint64_t parse_timecode(uint8_t *buf) {
+static uint64_t parse_timecode(const uint8_t *buf) {
int i;
int64_t ms = 0;
if (buf[2] != ':' || buf[5] != ':' || buf[8] != '.')
@@ -44,9 +44,9 @@ static uint64_t parse_timecode(uint8_t *
}
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- uint8_t *buf, int buf_size) {
+ const uint8_t *buf, int buf_size) {
AVSubtitle *sub = data;
- uint8_t *buf_end = buf + buf_size;
+ const uint8_t *buf_end = buf + buf_size;
uint8_t *bitmap;
int w, h, x, y, rlelen, i;
GetBitContext gb;
More information about the ffmpeg-cvslog
mailing list