[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec 4xm.c, 1.18, 1.19 asv1.c, 1.20, 1.21 flac.c, 1.21, 1.22 h264.c, 1.181, 1.182 huffyuv.c, 1.65, 1.66 mdec.c, 1.17, 1.18 mpeg4data.h, 1.25, 1.26 mpegvideo.h, 1.233, 1.234 shorten.c, 1.2, 1.3

Diego Biurrun CVS diego
Wed Jan 25 23:10:17 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv184/libavcodec

Modified Files:
	4xm.c asv1.c flac.c h264.c huffyuv.c mdec.c mpeg4data.h 
	mpegvideo.h shorten.c 
Log Message:
warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it


Index: 4xm.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/4xm.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- 4xm.c	12 Jan 2006 22:43:14 -0000	1.18
+++ 4xm.c	25 Jan 2006 22:10:12 -0000	1.19
@@ -123,7 +123,7 @@
     int last_dc;
     DCTELEM __align8 block[6][64];
     uint8_t *bitstream_buffer;
-    int bitstream_buffer_size;
+    unsigned int bitstream_buffer_size;
     CFrameBuffer cfrm[CFRAME_BUFFER_COUNT];
 } FourXContext;
 

Index: asv1.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/asv1.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- asv1.c	12 Jan 2006 22:43:14 -0000	1.20
+++ asv1.c	25 Jan 2006 22:10:12 -0000	1.21
@@ -48,7 +48,7 @@
     uint16_t __align8 intra_matrix[64];
     int __align8 q_intra_matrix[64];
     uint8_t *bitstream_buffer;
-    int bitstream_buffer_size;
+    unsigned int bitstream_buffer_size;
 } ASV1Context;
 
 static const uint8_t scantab[64]={

Index: flac.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/flac.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- flac.c	12 Jan 2006 22:43:15 -0000	1.21
+++ flac.c	25 Jan 2006 22:10:12 -0000	1.22
@@ -66,7 +66,7 @@
     uint8_t *bitstream;
     int bitstream_size;
     int bitstream_index;
-    int allocated_bitstream_size;
+    unsigned int allocated_bitstream_size;
 } FLACContext;
 
 #define METADATA_TYPE_STREAMINFO 0

Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- h264.c	24 Jan 2006 10:33:13 -0000	1.181
+++ h264.c	25 Jan 2006 22:10:12 -0000	1.182
@@ -162,7 +162,7 @@
 #define NAL_SPS_EXT             13
 #define NAL_AUXILIARY_SLICE     19
     uint8_t *rbsp_buffer;
-    int rbsp_buffer_size;
+    unsigned int rbsp_buffer_size;
 
     /**
       * Used to parse AVC variant of h264

Index: huffyuv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/huffyuv.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- huffyuv.c	12 Jan 2006 22:43:15 -0000	1.65
+++ huffyuv.c	25 Jan 2006 22:10:12 -0000	1.66
@@ -72,7 +72,7 @@
     VLC vlc[3];
     AVFrame picture;
     uint8_t *bitstream_buffer;
-    int bitstream_buffer_size;
+    unsigned int bitstream_buffer_size;
     DSPContext dsp;
 }HYuvContext;
 

Index: mdec.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mdec.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mdec.c	12 Jan 2006 22:43:15 -0000	1.17
+++ mdec.c	25 Jan 2006 22:10:12 -0000	1.18
@@ -49,7 +49,7 @@
     uint16_t __align8 intra_matrix[64];
     int __align8 q_intra_matrix[64];
     uint8_t *bitstream_buffer;
-    int bitstream_buffer_size;
+    unsigned int bitstream_buffer_size;
     int block_last_index[6];
 } MDECContext;
 

Index: mpeg4data.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpeg4data.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- mpeg4data.h	17 Dec 2005 18:14:28 -0000	1.25
+++ mpeg4data.h	25 Jan 2006 22:10:12 -0000	1.26
@@ -169,7 +169,7 @@
 {0x3F7C, 15},{0x3F7D, 15},{0x0000, 4}
 };
 
-static const uint8_t inter_rvlc_run[169]={
+static const int8_t inter_rvlc_run[169]={
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  1,  1,  1,  1,  1,
@@ -194,7 +194,7 @@
 43, 44,
 };
 
-static const uint8_t inter_rvlc_level[169]={
+static const int8_t inter_rvlc_level[169]={
  1,  2,  3,  4,  5,  6,  7,  8,
  9, 10, 11, 12, 13, 14, 15, 16,
 17, 18, 19,  1,  2,  3,  4,  5,
@@ -273,7 +273,7 @@
 {0x3F7C, 15},{0x3F7D, 15},{0x0000,  4}
 };
 
-static const uint8_t intra_rvlc_run[169]={
+static const int8_t intra_rvlc_run[169]={
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  0,  0,  0,  0,  0,
@@ -298,7 +298,7 @@
 43, 44,
 };
 
-static const uint8_t intra_rvlc_level[169]={
+static const int8_t intra_rvlc_level[169]={
  1,  2,  3,  4,  5,  6,  7,  8,
  9, 10, 11, 12, 13, 14, 15, 16,
 17, 18, 19, 20, 21, 22, 23, 24,

Index: mpegvideo.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.h,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- mpegvideo.h	24 Jan 2006 21:57:26 -0000	1.233
+++ mpegvideo.h	25 Jan 2006 22:10:12 -0000	1.234
@@ -194,7 +194,7 @@
     uint8_t *buffer;
     int index;
     int last_index;
-    int buffer_size;
+    unsigned int buffer_size;
     uint32_t state;             ///< contains the last few bytes in MSB order
     int frame_start_found;
     int overread;               ///< the number of bytes which where irreversibly read from the next frame
@@ -610,7 +610,7 @@
     int divx_packed;
     uint8_t *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
     int bitstream_buffer_size;
-    int allocated_bitstream_buffer_size;
+    unsigned int allocated_bitstream_buffer_size;
 
     int xvid_build;
 

Index: shorten.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/shorten.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shorten.c	12 Jan 2006 22:43:16 -0000	1.2
+++ shorten.c	25 Jan 2006 22:10:12 -0000	1.3
@@ -84,7 +84,7 @@
     uint8_t *bitstream;
     int bitstream_size;
     int bitstream_index;
-    int allocated_bitstream_size;
+    unsigned int allocated_bitstream_size;
     int header_size;
     uint8_t header[OUT_BUFFER_SIZE];
     int version;





More information about the ffmpeg-cvslog mailing list