Makefile: strip x264cli.

[x264] / x264.h

diff --git a/x264.h b/x264.h
index d8963bf07f0b5374feb96e0b64b968cfa8af5284..f7d9d18136a6fb374b8c2171ac56169876a1d885 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -26,7 +26,7 @@
 
 #include <stdarg.h>
 
-#define X264_BUILD 0x0013
+#define X264_BUILD 22
 
 /* x264_t:
  *      opaque handler for decoder and encoder */
@@ -75,7 +75,10 @@ typedef struct x264_t x264_t;
 #define X264_TYPE_IDR           0x0001
 #define X264_TYPE_I             0x0002
 #define X264_TYPE_P             0x0003
-#define X264_TYPE_B             0x0004
+#define X264_TYPE_BREF          0x0004  /* Non-disposable B-frame */
+#define X264_TYPE_B             0x0005
+#define IS_X264_TYPE_I(x) ((x)==X264_TYPE_I || (x)==X264_TYPE_IDR)
+#define IS_X264_TYPE_B(x) ((x)==X264_TYPE_B || (x)==X264_TYPE_BREF)
 
 /* Log level
  */
@@ -115,6 +118,7 @@ typedef struct
     int         i_bframe;   /* how many b-frame between 2 references pictures */
     int         b_bframe_adaptive;
     int         i_bframe_bias;
+    int         b_bframe_pyramid;   /* Keep some B-frames as references */
 
     int         b_deblocking_filter;
     int         i_deblocking_filter_alphac0;    /* [-6, 6] -6 light filter, 6 strong */
@@ -137,10 +141,13 @@ typedef struct
 
         int          i_direct_mv_pred; /* spatial vs temporal mv prediction */
         int          i_subpel_refine; /* subpixel motion estimation quality */
+        int          b_chroma_me; /* chroma ME for subpel and mode decision in P-frames */
         int          i_mv_range; /* maximum length of a mv (in pixels) */
 
         int          b_weighted_bipred; /* implicit weighting for B-frames */
 
+        int          i_chroma_qp_offset;
+
         int          b_psnr;    /* Do we compute PSNR stats (save a few % of cpu) */
     } analyse;
 
@@ -173,6 +180,7 @@ typedef struct
         float       f_complexity_blur; /* temporally blur complexity */
     } rc;
 
+    int b_aud;                  /* generate access unit delimiters */
 } x264_param_t;
 
 /* x264_param_default:
@@ -228,7 +236,8 @@ enum nal_unit_type_e
     NAL_SLICE_IDR   = 5,    /* ref_idc != 0 */
     NAL_SEI         = 6,    /* ref_idc == 0 */
     NAL_SPS         = 7,
-    NAL_PPS         = 8
+    NAL_PPS         = 8,
+    NAL_AUD         = 9,
     /* ref_idc == 0 for 6,9,10,11,12 */
 };
 enum nal_priority_e