summaryrefslogtreecommitdiffstats
path: root/libhb/dvd.c
diff options
context:
space:
mode:
authordynaflash <[email protected]>2010-05-20 15:28:27 +0000
committerdynaflash <[email protected]>2010-05-20 15:28:27 +0000
commit5c0877e87e58f15cf5fe86c43afaad0778a8817d (patch)
tree6100ce310d0bedebcc3c1bf50883ab2365f846e0 /libhb/dvd.c
parentf6b620012c27bc2858ea0ad198bd3edf34965ca3 (diff)
Support for reading VOB subtitle tracks from file inputs initital implementation.
- Patch by davidfstr, Nice Work! - Adds support for reading VOB subtitle tracks from file inputs. Tested with: - MKV VOB -> MKV VOB passthru. - MKV VOB -> MKV VOB burned in. VOB subtitle palette moved from per-title to per-track. Discussion leading up to commit can be referenced here: http://forum.handbrake.fr/viewtopic.php?f=4&t=16267 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3308 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/dvd.c')
-rw-r--r--libhb/dvd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libhb/dvd.c b/libhb/dvd.c
index e51fd95bf..ee10dd507 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -443,10 +443,6 @@ static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t )
hb_list_add( title->list_audio, audio );
}
- memcpy( title->palette,
- vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
- 16 * sizeof( uint32_t ) );
-
/* Check for subtitles */
for( i = 0; i < vts->vtsi_mat->nr_of_vts_subp_streams; i++ )
{
@@ -502,6 +498,10 @@ static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t )
subtitle->config.dest = RENDERSUB; // By default render (burn-in) the VOBSUB.
subtitle->type = lang_extension;
+
+ memcpy( subtitle->palette,
+ vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
+ 16 * sizeof( uint32_t ) );
switch( lang_extension )
{