softsubtitles:

- when doing an indepth scan, do not scan CC tracks
- separate subtitle configureation attributes into separate 
  hb_subtitle_config_t.  Add an instance of this to hb_job_t for
  setting the attributes of the subtitle found through an indepth scan
- Add a default_track flag to hb_subtitle_config_t that tells the muxer
  that the track should be flaged as the default. muxmkv uses this.
- When an indepth scan is complete, check to see if the autoselected 
  subtitle matchces (by id) one of the manually selected subtitles. 
  If a match is found, the autoselected subtitle with all the attributes 
  the user assigned to it replaces the manually selected subtitle.
- LinGui: Add "Default" column to subtitle tab.  This is a radio that lets
  the user choose which subtitle should be displayed by default.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2468 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 2 insertions, 2 deletions

diff --git a/libhb/decvobsub.c b/libhb/decvobsub.c
index e5633d54d..2a5ccab01 100644
--- a/libhb/decvobsub.c
+++ b/libhb/decvobsub.c
@@ -484,7 +484,7 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
     /* Get infos about the subtitle */
     ParseControls( w );
 
-    if( job->indepth_scan || ( w->subtitle->force && pv->pts_forced == 0 ) )
+    if( job->indepth_scan || ( w->subtitle->config.force && pv->pts_forced == 0 ) )
     {
         /*
          * Don't encode subtitles when doing a scan.
@@ -495,7 +495,7 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
         return NULL;
     }
 
-    if (w->subtitle->dest == PASSTHRUSUB)
+    if (w->subtitle->config.dest == PASSTHRUSUB)
     {
         pv->buf->start  = pv->pts_start;
         pv->buf->stop   = pv->pts_stop;