Much better B-frame muxing frame-reordering. This will preserve the sps/pps info...

[handbrake-jp/handbrake-jp-git.git] / libhb / internal.h

diff --git a/libhb/internal.h b/libhb/internal.h
index fb57318..efe721e 100644 (file)
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -39,6 +39,9 @@ struct hb_buffer_s
     int64_t       stop;
     int           key;
 
+    /* Holds the output PTS from x264, for use by b-frame offsets in muxmp4.c */
+    int64_t     renderOffset;
+
     int           x;
     int           y;
     int           width;
@@ -116,6 +119,7 @@ void         hb_dvd_close( hb_dvd_t ** );
 #define HB_CONFIG_MAX_SIZE 8192
 union hb_esconfig_u
 {
+
     struct
     {
         uint8_t bytes[HB_CONFIG_MAX_SIZE];
@@ -134,29 +138,20 @@ union hb_esconfig_u
     {
         uint8_t bytes[HB_CONFIG_MAX_SIZE];
         int     length;
-       /* Total channels actually used for this audio track */
-       int channelsused;
-        int lfechannels;
     } aac;
 
     struct
     {
         uint8_t headers[3][HB_CONFIG_MAX_SIZE];
-        int channelsused;
         char *language;
     } vorbis;
     
     struct
     {
-       /* indicates the number of normal channels the source audio has */
-        int  channels;
-       /* indicates the number of lfe channels the source audio has */
-       int  lfechannels;
-       /* ac3flags:       stores the flags from the AC3 source, as found in scan.c */
+       /* ac3flags stores the flags from the AC3 source, as found in scan.c */
        int  ac3flags;
-       /* Total channels actually used for this audio track */
-       int channelsused;
     } a52;
+
 };
 
 enum