X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Ffifo.c;h=48f6459709b269d3f60eff34ad1155f7588fe023;hb=0f7cba7abcdf2d40f125f734839dfdfaa264c70d;hp=9441f7172c096983a296445826952ebe8ad01703;hpb=8ab542f1e527adc6058fde914347a556e0b5b78b;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/fifo.c b/libhb/fifo.c index 9441f717..48f64597 100644 --- a/libhb/fifo.c +++ b/libhb/fifo.c @@ -90,8 +90,8 @@ void hb_buffer_pool_free( void ) } } - hb_deep_log( 2, "Allocated %lld bytes of buffers on this pass and Freed %lld bytes, " - "%lld bytes leaked", buffers.allocated, freed, buffers.allocated - freed); + hb_deep_log( 2, "Allocated %"PRId64" bytes of buffers on this pass and Freed %"PRId64" bytes, " + "%"PRId64" bytes leaked", buffers.allocated, freed, buffers.allocated - freed); buffers.allocated = 0; hb_unlock(buffers.lock); } @@ -147,7 +147,7 @@ hb_buffer_t * hb_buffer_init( int size ) if (size) { -#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) +#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined( SYS_MINGW ) b->data = malloc( b->alloc ); #elif defined( SYS_CYGWIN ) /* FIXME */ @@ -191,6 +191,7 @@ void hb_buffer_close( hb_buffer_t ** _b ) if( buffer_pool && b->data && !hb_fifo_is_full( buffer_pool ) ) { hb_fifo_push_head( buffer_pool, b ); + *_b = NULL; return; } /* either the pool is full or this size doesn't use a pool - free the buf */