- fixed regression: mov/png-sequence decoding.

[handbrake-jp/handbrake-jp-git.git] / libhb / reader.c

diff --git a/libhb/reader.c b/libhb/reader.c
index e034537..9ac515c 100644 (file)
--- a/libhb/reader.c
+++ b/libhb/reader.c
@@ -457,6 +457,13 @@ static void ReaderFunc( void * _r )
             push_buf( r, audio->priv.fifo_in, hb_buffer_init(0) );
     }
 
+    hb_subtitle_t *subtitle;
+    for( n = 0; ( subtitle = hb_list_item( r->job->title->list_subtitle, n ) ); ++n )
+    {
+        if ( subtitle->fifo_in && subtitle->source == VOBSUB)
+            push_buf( r, subtitle->fifo_in, hb_buffer_init(0) );
+    }
+
     hb_list_empty( &list );
     hb_buffer_close( &ps );
     if (r->dvd)
@@ -520,7 +527,7 @@ static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id )
         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 || subtitle->config.force )
             {
                 /*
                  * Pass the subtitles to be processed if we are not scanning, or if