X264_ABS => abs

[x264] / x264.h

diff --git a/x264.h b/x264.h
index a0158007e0ddd448fc3133a51dd7939a27e34225..ebbb4d2be8279f33fc2c008e8db10a1e53dd8d3e 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -35,7 +35,7 @@
 
 #include <stdarg.h>
 
-#define X264_BUILD 36
+#define X264_BUILD 38
 
 /* x264_t:
  *      opaque handler for decoder and encoder */
@@ -127,6 +127,7 @@ typedef struct
     int         i_height;
     int         i_csp;  /* CSP of encoded bitstream, only i420 supported */
     int         i_level_idc; 
+    int         i_frame_total; /* number of frames to encode if known, else 0 */
 
     struct
     {
@@ -204,13 +205,14 @@ typedef struct
     /* Rate control parameters */
     struct
     {
-        int         i_qp_constant;  /* 1-51 */
+        int         i_qp_constant;  /* 0-51 */
         int         i_qp_min;       /* min allowed QP value */
         int         i_qp_max;       /* max allowed QP value */
         int         i_qp_step;      /* max QP step between frames */
 
         int         b_cbr;          /* use bitrate instead of CQP */
         int         i_bitrate;
+        int         i_rf_constant;  /* 1pass VBR, nominal QP */
         float       f_rate_tolerance;
         int         i_vbv_max_bitrate;
         int         i_vbv_buffer_size;
@@ -344,22 +346,6 @@ int     x264_encoder_encode ( x264_t *, x264_nal_t **, int *, x264_picture_t *,
 void    x264_encoder_close  ( x264_t * );
 
 /* XXX: decoder isn't working so no need to export it */
-#if 0
-/****************************************************************************
- * Decoder functions:
- ****************************************************************************
- * XXX: Not yet working so do not try ...
- ****************************************************************************/
-/* x264_decoder_open:
- */
-x264_t *x264_decoder_open   ( x264_param_t * );
-/* x264_decoder_decode:
- */
-int     x264_decoder_decode ( x264_t *, x264_picture_t **, x264_nal_t * );
-/* x264_decoder_close:
- */
-void    x264_decoder_close  ( x264_t * );
-#endif
 
 /****************************************************************************
  * Private stuff for internal usage:
@@ -368,6 +354,7 @@ void    x264_decoder_close  ( x264_t * );
 #   ifdef _MSC_VER
 #       define inline __inline
 #       define DECLARE_ALIGNED( type, var, n ) __declspec(align(n)) type var
+#              define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
 #   else
 #       define DECLARE_ALIGNED( type, var, n ) type var __attribute__((aligned(n)))
 #   endif