X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Freader.c;h=88617f90b63eba6aed464a896ef6ee45e07ed256;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=f7470bfa2634237efdf04460d878cb4a1fbc4e7f;hpb=f2ddc7f1833625cfccf3ef6d3659963b01001e98;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/reader.c b/libhb/reader.c
index f7470bfa..88617f90 100644
--- a/libhb/reader.c
+++ b/libhb/reader.c
@@ -343,7 +343,7 @@ static void ReaderFunc( void * _r )
                     // force a new scr offset computation
                     r->scr_changes = r->demux.scr_changes - 1;
                     r->saw_video = 1;
-                    hb_log( "reader: first SCR %lld", r->demux.last_scr );
+                    hb_log( "reader: first SCR %"PRId64, r->demux.last_scr );
                 }
                 else
                 {
@@ -408,6 +408,8 @@ static void ReaderFunc( void * _r )
                             // packet of a stream we've never seen before. We
                             // have no idea what the timing should be so toss
                             // this buffer & wait for a stream we've already seen.
+                            // add stream to list of streams we have seen
+                            id_to_st( r, buf );
                             hb_buffer_close( &buf );
                             continue;
                         }
@@ -460,7 +462,7 @@ static void ReaderFunc( void * _r )
     hb_subtitle_t *subtitle;
     for( n = 0; ( subtitle = hb_list_item( r->job->title->list_subtitle, n ) ); ++n )
     {
-        if ( subtitle->fifo_in )
+        if ( subtitle->fifo_in && subtitle->source == VOBSUB)
             push_buf( r, subtitle->fifo_in, hb_buffer_init(0) );
     }
 
@@ -501,8 +503,8 @@ static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id )
     hb_title_t    * title = job->title;
     hb_audio_t    * audio;
     hb_subtitle_t * subtitle;
-    int             i, n;
-    static hb_fifo_t * fifos[8];
+    int             i, n, count;
+    static hb_fifo_t * fifos[100];
 
     memset(fifos, 0, sizeof(fifos));
 
@@ -523,23 +525,28 @@ static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id )
         }
     }
 
-    for( i=0; i < hb_list_count( title->list_subtitle ); i++ ) {
+    n = 0;
+    count = hb_list_count( title->list_subtitle );
+    count = count > 99 ? 99 : count;
+    for( i=0; i < count; i++ ) {
         subtitle =  hb_list_item( title->list_subtitle, i );
         if (id == subtitle->id) {
             subtitle->hits++;
-            if( !job->indepth_scan || job->subtitle_force )
+            if( !job->indepth_scan || job->select_subtitle_config.force )
             {
                 /*
                  * Pass the subtitles to be processed if we are not scanning, or if
                  * we are scanning and looking for forced subs, then pass them up
                  * to decode whether the sub is a forced one.
                  */
-                fifos[0] = subtitle->fifo_in;
-                return fifos;
+                fifos[n++] = subtitle->fifo_in;
             }
-            break;
         }
     }
+    if ( n != 0 )
+    {
+        return fifos;
+    }
     
     if( !job->indepth_scan )
     {