X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=224b40c78ea410d435660e70b2c5e0233e37648c;hb=7f175b3b6cddbf614ef849cb4b915c5dd70b66c8;hp=dfa1dcabdf1925f1722afb9262e2847f8295d5a6;hpb=64db42bb1203f530ea328a80d105054ea40c1e84;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/common.h b/libhb/common.h
index dfa1dcab..224b40c7 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -238,7 +238,6 @@ struct hb_job_s
 
     int indepth_scan;
     hb_subtitle_t ** select_subtitle;
-    int subtitle_force;
     char * native_language;
 
     int             angle;              // dvd angle to encode
@@ -443,8 +442,9 @@ struct hb_subtitle_s
     int track;
     int  id;
     enum subtype { PICTURESUB, TEXTSUB } format;
-    enum subsource { VOBSUB, SRTSUB, CCSUB } source;
+    enum subsource { VOBSUB, SRTSUB, CC608SUB, CC708SUB } source;
     enum subdest { RENDERSUB, PASSTHRUSUB } dest;
+    int  force;
     char lang[1024];
     char iso639_2[4];
     uint8_t type; /* Closed Caption, Childrens, Directors etc */
@@ -458,6 +458,7 @@ struct hb_subtitle_s
     hb_fifo_t * fifo_raw; /* Decoded SPU */
     hb_fifo_t * fifo_sync;/* Synced */
     hb_fifo_t * fifo_out; /* Correct Timestamps, ready to be muxed */
+    hb_mux_data_t * mux_data;
 #endif
 };
 
@@ -638,6 +639,9 @@ struct hb_work_object_s
     /* Pointer hb_audio_t so we have access to the info in the audio worker threads. */
     hb_audio_t        * audio;
 
+    /* Pointer hb_subtitle_t so we have access to the info in the subtitle worker threads. */
+    hb_subtitle_t     * subtitle;
+
     hb_work_private_t * private_data;
 
     hb_thread_t       * thread;
@@ -653,8 +657,9 @@ struct hb_work_object_s
 
 extern hb_work_object_t hb_sync;
 extern hb_work_object_t hb_decmpeg2;
-extern hb_work_object_t hb_decsub;
-extern hb_work_object_t hb_encsub;
+extern hb_work_object_t hb_decvobsub;
+extern hb_work_object_t hb_encvobsub;
+extern hb_work_object_t hb_deccc608;
 extern hb_work_object_t hb_render;
 extern hb_work_object_t hb_encavcodec;
 extern hb_work_object_t hb_encxvid;