Revision d375c104 libavcodec/utils.c

View differences:

libavcodec/utils.c
366 366
    assert(pic->type==FF_BUFFER_TYPE_INTERNAL);
367 367
    assert(s->internal_buffer_count);
368 368

  
369
    if(s->internal_buffer){
369 370
    buf = NULL; /* avoids warning */
370 371
    for(i=0; i<s->internal_buffer_count; i++){ //just 3-5 checks so is not worth to optimize
371 372
        buf= &((InternalBuffer*)s->internal_buffer)[i];
......
377 378
    last = &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count];
378 379

  
379 380
    FFSWAP(InternalBuffer, *buf, *last);
381
    }
380 382

  
381 383
    for(i=0; i<4; i++){
382 384
        pic->data[i]=NULL;
......
572 574
            goto free_and_end;
573 575
        }
574 576
    }
577

  
575 578
    ret=0;
576 579
end:
577 580
    entangled_thread_counter--;
......
1298 1301
unsigned int ff_toupper4(unsigned int x)
1299 1302
{
1300 1303
    return     toupper( x     &0xFF)
1301
            + (toupper((x>>8 )&0xFF)<<8 )
1302
            + (toupper((x>>16)&0xFF)<<16)
1303
            + (toupper((x>>24)&0xFF)<<24);
1304
    + (toupper((x>>8 )&0xFF)<<8 )
1305
    + (toupper((x>>16)&0xFF)<<16)
1306
    + (toupper((x>>24)&0xFF)<<24);
1304 1307
}
1305 1308

  
1306 1309
#if !HAVE_PTHREADS

Also available in: Unified diff