Commit: d5a9342b573294d9af3a77915a80bbeb442bdd09 - handbrake-jp-git (git)

githubのコードからのfolk

Commit MetaInfo

• Revision: d5a9342b573294d9af3a77915a80bbeb442bdd09 (tree)
• Time: 2010-10-04 02:10:49
• Author: jstebbins <jstebbins@b64f...>
• Commiter: jstebbins

Log Message

fix another hang in the muxer.

If all streams are at EOF, then we must continue processing
the track queues till they are all empty.

git-svn-id: svn://localhost/HandBrake/trunk@3564 b64f7644-9d1e-0410-96f1-a4d463321fa5

Change Summary

• modified: libhb/muxcommon.c

Incremental Difference

--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
@@ -247,7 +247,8 @@ static int muxWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
     int more = mux->rdy;
     // all tracks have at least 'interleave' ticks of data. Output
     // all that we can in 'interleave' size chunks.
-    while ( ( mux->rdy & mux->allRdy ) == mux->allRdy && more )
+    while ( (( mux->rdy & mux->allRdy ) == mux->allRdy && more) ||
+            ( mux->eof == mux->allEof ) ) 
     {
         more = 0;
         for ( i = 0; i < mux->ntracks; ++i )