OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed regression: mov/png-sequence decoding.
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
fifo.c
diff --git
a/libhb/fifo.c
b/libhb/fifo.c
index
ea2a292
..
7337874
100644
(file)
--- a/
libhb/fifo.c
+++ b/
libhb/fifo.c
@@
-85,12
+85,12
@@
void hb_buffer_pool_free( void )
}
if ( count )
{
}
if ( count )
{
- hb_
log(
"Freed %d buffers of size %d", count,
+ hb_
deep_log( 2,
"Freed %d buffers of size %d", count,
buffers.pool[i]->buffer_size);
}
}
buffers.pool[i]->buffer_size);
}
}
- hb_
log(
"Allocated %lld bytes of buffers on this pass and Freed %lld bytes, "
+ 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);
buffers.allocated = 0;
hb_unlock(buffers.lock);
"%lld 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 (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 */
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 );
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 */
return;
}
/* either the pool is full or this size doesn't use a pool - free the buf */
@@
-376,7
+377,7
@@
void hb_fifo_close( hb_fifo_t ** _f )
hb_fifo_t * f = *_f;
hb_buffer_t * b;
hb_fifo_t * f = *_f;
hb_buffer_t * b;
- hb_
log(
"fifo_close: trashing %d buffer(s)", hb_fifo_size( f ) );
+ hb_
deep_log( 2,
"fifo_close: trashing %d buffer(s)", hb_fifo_size( f ) );
while( ( b = hb_fifo_get( f ) ) )
{
hb_buffer_close( &b );
while( ( b = hb_fifo_get( f ) ) )
{
hb_buffer_close( &b );