summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-02-01 04:07:48 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-02-01 04:07:48 +0000
commit21cc343d85a01b6417e25979f005c761196408e5 (patch)
treeedf21cf1584249b397af46de0529dbd7cc9457e8
parent75739ba290ae16e7547d753f7f27ddb583a1179b (diff)
const
Originally committed as revision 11722 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/cook.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 193931a512..8fa14e31cd 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -301,10 +301,10 @@ static void init_cplscales_table (COOKContext *q) {
#define DECODE_BYTES_PAD1(bytes) (3 - ((bytes)+3) % 4)
#define DECODE_BYTES_PAD2(bytes) ((bytes) % 4 + DECODE_BYTES_PAD1(2 * (bytes)))
-static inline int decode_bytes(uint8_t* inbuffer, uint8_t* out, int bytes){
+static inline int decode_bytes(const uint8_t* inbuffer, uint8_t* out, int bytes){
int i, off;
uint32_t c;
- uint32_t* buf;
+ const uint32_t* buf;
uint32_t* obuf = (uint32_t*) out;
/* FIXME: 64 bit platforms would be able to do 64 bits at a time.
* I'm too lazy though, should be something like
@@ -313,7 +313,7 @@ static inline int decode_bytes(uint8_t* inbuffer, uint8_t* out, int bytes){
* Buffer alignment needs to be checked. */
off = (int)((long)inbuffer & 3);
- buf = (uint32_t*) (inbuffer - off);
+ buf = (const uint32_t*) (inbuffer - off);
c = be2me_32((0x37c511f2 >> (off*8)) | (0x37c511f2 << (32-(off*8))));
bytes += 3 + off;
for (i = 0; i < bytes/4; i++)
@@ -875,7 +875,7 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
*/
static inline void
-decode_bytes_and_gain(COOKContext *q, uint8_t *inbuffer,
+decode_bytes_and_gain(COOKContext *q, const uint8_t *inbuffer,
cook_gains *gains_ptr)
{
int offset;
@@ -944,7 +944,7 @@ mlt_compensate_output(COOKContext *q, float *decode_buffer,
*/
-static int decode_subpacket(COOKContext *q, uint8_t *inbuffer,
+static int decode_subpacket(COOKContext *q, const uint8_t *inbuffer,
int sub_packet_size, int16_t *outbuffer) {
/* packet dump */
// for (i=0 ; i<sub_packet_size ; i++) {
@@ -989,7 +989,7 @@ static int decode_subpacket(COOKContext *q, uint8_t *inbuffer,
static int cook_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size) {
+ const uint8_t *buf, int buf_size) {
COOKContext *q = avctx->priv_data;
if (buf_size < avctx->block_align)
@@ -1038,7 +1038,7 @@ static void dump_cook_context(COOKContext *q)
static int cook_decode_init(AVCodecContext *avctx)
{
COOKContext *q = avctx->priv_data;
- uint8_t *edata_ptr = avctx->extradata;
+ const uint8_t *edata_ptr = avctx->extradata;
/* Take care of the codec specific extradata. */
if (avctx->extradata_size <= 0) {