diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2003-06-20 15:21:25 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2003-06-20 15:21:25 +0000 |
| commit | eb60dddc2e5b61041409ededb337d2ba1c21ef03 (patch) | |
| tree | 6d7b12513cfa613fef699f9df44e1a09a8d1d8bb | |
| parent | a7d3e7729ad2acde4acec45ddc9f61a1a23be05b (diff) | |
| download | ffmpeg-eb60dddc2e5b61041409ededb337d2ba1c21ef03.tar.gz | |
some warning fixes
Originally committed as revision 1977 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/asv1.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/mjpeg.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index bc36f1b003..296feec5cc 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -125,9 +125,9 @@ static inline int decode_block(ASV1Context *a, DCTELEM block[64]){ } if(ccp&1) block[a->scantable.permutated[4*i+0]]= (get_level(&a->gb) * a->intra_matrix[4*i+0])>>4; - if(ccp&2) block[a->scantable.permutated[4*i+1]]= (get_level(&a->gb) * a->intra_matrix[4*i+1])>>4;; - if(ccp&4) block[a->scantable.permutated[4*i+2]]= (get_level(&a->gb) * a->intra_matrix[4*i+2])>>4;; - if(ccp&8) block[a->scantable.permutated[4*i+3]]= (get_level(&a->gb) * a->intra_matrix[4*i+3])>>4;; + if(ccp&2) block[a->scantable.permutated[4*i+1]]= (get_level(&a->gb) * a->intra_matrix[4*i+1])>>4; + if(ccp&4) block[a->scantable.permutated[4*i+2]]= (get_level(&a->gb) * a->intra_matrix[4*i+2])>>4; + if(ccp&8) block[a->scantable.permutated[4*i+3]]= (get_level(&a->gb) * a->intra_matrix[4*i+3])>>4; } } diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 97af5b95c0..e73f32d7a2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4009,8 +4009,8 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ MpegEncContext * const s = &h->s; AVCodecContext * const avctx= s->avctx; int buf_index=0; - int i; #if 0 + int i; for(i=0; i<32; i++){ printf("%X ", buf[i]); } diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index ec80464468..454238a4c2 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -1599,7 +1599,7 @@ out: static int mjpeg_decode_com(MJpegDecodeContext *s) { /* XXX: verify len field validity */ - unsigned int len = get_bits(&s->gb, 16); + int len = get_bits(&s->gb, 16); if (len >= 2 && len < 32768) { /* XXX: any better upper bound */ uint8_t *cbuf = av_malloc(len - 1); |