[FFmpeg-cvslog] r11797 - in trunk/libavutil: lzo.c lzo.h

reimar subversion
Fri Feb 1 17:30:52 CET 2008


Author: reimar
Date: Fri Feb  1 17:30:51 2008
New Revision: 11797

Log:
LZO decoder input is const


Modified:
   trunk/libavutil/lzo.c
   trunk/libavutil/lzo.h

Modified: trunk/libavutil/lzo.c
==============================================================================
--- trunk/libavutil/lzo.c	(original)
+++ trunk/libavutil/lzo.c	Fri Feb  1 17:30:51 2008
@@ -29,7 +29,7 @@
 //! define if we may read up to 8 bytes beyond the input buffer
 #define INBUF_PADDED 1
 typedef struct LZOContext {
-    uint8_t *in, *in_end;
+    const uint8_t *in, *in_end;
     uint8_t *out_start, *out, *out_end;
     int error;
 } LZOContext;
@@ -84,7 +84,7 @@ static inline int get_len(LZOContext *c,
  * \param cnt number of bytes to copy, must be >= 0
  */
 static inline void copy(LZOContext *c, int cnt) {
-    register uint8_t *src = c->in;
+    register const uint8_t *src = c->in;
     register uint8_t *dst = c->out;
     if (cnt > c->in_end - src) {
         cnt = FFMAX(c->in_end - src, 0);
@@ -115,7 +115,7 @@ static inline void copy(LZOContext *c, i
  * thus creating a repeating pattern with a period length of back.
  */
 static inline void copy_backptr(LZOContext *c, int back, int cnt) {
-    register uint8_t *src = &c->out[-back];
+    register const uint8_t *src = &c->out[-back];
     register uint8_t *dst = c->out;
     if (src < c->out_start || src > dst) {
         c->error |= LZO_INVALID_BACKPTR;
@@ -171,12 +171,12 @@ static inline void copy_backptr(LZOConte
  * make sure all buffers are appropriately padded, in must provide
  * LZO_INPUT_PADDING, out must provide LZO_OUTPUT_PADDING additional bytes
  */
-int lzo1x_decode(void *out, int *outlen, void *in, int *inlen) {
+int lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) {
     int state= 0;
     int x;
     LZOContext c;
     c.in = in;
-    c.in_end = (uint8_t *)in + *inlen;
+    c.in_end = (const uint8_t *)in + *inlen;
     c.out = c.out_start = out;
     c.out_end = (uint8_t *)out + * outlen;
     c.error = 0;

Modified: trunk/libavutil/lzo.h
==============================================================================
--- trunk/libavutil/lzo.h	(original)
+++ trunk/libavutil/lzo.h	Fri Feb  1 17:30:51 2008
@@ -30,6 +30,6 @@
 #define LZO_INPUT_PADDING 8
 #define LZO_OUTPUT_PADDING 12
 
-int lzo1x_decode(void *out, int *outlen, void *in, int *inlen);
+int lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
 
 #endif /* FFMPEG_LZO_H */




More information about the ffmpeg-cvslog mailing list