diff options
| author | jstebbins <[email protected]> | 2010-06-01 20:21:49 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-06-01 20:21:49 +0000 |
| commit | 9728615d2d5871efb7c37cdedb9175fa1b7844d6 (patch) | |
| tree | 166ddd10201b26e90e3d810562408b7983e38985 /libhb/work.c | |
| parent | f22a86152809db1e5a44b0a24b4c865c8f9f997d (diff) | |
Add SSA subtitle support
Thanks to davidfster
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3342 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/work.c')
| -rw-r--r-- | libhb/work.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libhb/work.c b/libhb/work.c index d6e60ea3a..c1891a683 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -320,7 +320,8 @@ void hb_display_job_info( hb_job_t * job ) subtitle->source == VOBSUB ? "VOBSUB" : subtitle->source == CC608SUB || subtitle->source == CC708SUB ? "CC" : subtitle->source == UTF8SUB ? "UTF-8" : - subtitle->source == TX3GSUB ? "TX3G" : "Unknown", + subtitle->source == TX3GSUB ? "TX3G" : + subtitle->source == SSASUB ? "SSA" : "Unknown", subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through", subtitle->config.force ? ", Forced Only" : "", subtitle->config.default_track ? ", Default" : "" ); @@ -797,14 +798,19 @@ static void do_job( hb_job_t * job, int cpu_count ) if( !job->indepth_scan && subtitle->source == TX3GSUB ) { - // TODO(davidfstr): For MP4 containers, an alternate work-object - // should be used that just passes the packets through, - // instead of downconverting to UTF-8 subtitles. w = hb_get_work( WORK_DECTX3GSUB ); w->fifo_in = subtitle->fifo_in; w->fifo_out = subtitle->fifo_raw; hb_list_add( job->list_work, w ); } + + if( !job->indepth_scan && subtitle->source == SSASUB ) + { + w = hb_get_work( WORK_DECSSASUB ); + w->fifo_in = subtitle->fifo_in; + w->fifo_out = subtitle->fifo_raw; + hb_list_add( job->list_work, w ); + } if( !job->indepth_scan && subtitle->format == PICTURESUB |