X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fdeccc608sub.h;h=c142c2aec0ce6716876fac7c444a9d0c5e718b72;hb=55b0015a8c50106e553bc2f48336cc2a1c495459;hp=e6c1518a7b212b07bbd64ac7cda8ed19a6f56a33;hpb=5c5aaf3564f95386860c5a7fd66993cd85d06751;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/deccc608sub.h b/libhb/deccc608sub.h
index e6c1518a..c142c2ae 100644
--- a/libhb/deccc608sub.h
+++ b/libhb/deccc608sub.h
@@ -63,8 +63,6 @@ struct eia608_screen // A CC buffer
     int empty; // Buffer completely empty?    	
 };
 
-#define LLONG long long
-
 struct eia608
 {
     struct eia608_screen buffer1;
@@ -73,7 +71,7 @@ struct eia608
     int visible_buffer;
     int srt_counter; // Number of subs currently written
     int screenfuls_counter; // Number of meaningful screenfuls written
-    LLONG current_visible_start_ms; // At what time did the current visible buffer became so?
+    int64_t current_visible_start_ms; // At what time did the current visible buffer became so?
     // unsigned current_visible_start_cc; // At what time did the current visible buffer became so?
     enum cc_modes mode;
     unsigned char last_c1, last_c2;
@@ -90,8 +88,12 @@ struct s_write {
     int new_sentence;
     int new_channel;
     int in_xds_mode;
-    hb_subtitle_t * subtitle;
+    hb_buffer_t *hb_buffer;
+    hb_buffer_t *hb_last_buffer;
     uint64_t last_pts;
+    unsigned char *enc_buffer; // Generic general purpose buffer
+    unsigned enc_buffer_used;
+    unsigned enc_buffer_capacity;
 };
 
 enum command_code