some warning fixes

Originally committed as revision 1977 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Alex Beregszaszi 22 years ago
parent a7d3e7729a
commit eb60dddc2e
  1. 6
      libavcodec/asv1.c
  2. 2
      libavcodec/h264.c
  3. 2
      libavcodec/mjpeg.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;
}
}

@ -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]);
}

@ -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);

Loading…
Cancel
Save