Output pic struct information in libx264 API

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 6d6d2c2b21c799e3de24dc0d8bd4a2a7d003c552..5e9097d40e629479ace8f9f605458e53103bd933 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2817,6 +2817,7 @@ static int x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
     pic_out->i_type = h->fenc->i_type;
 
     pic_out->b_keyframe = h->fenc->b_keyframe;
+    pic_out->i_pic_struct = h->fenc->i_pic_struct;
 
     pic_out->i_pts = h->fdec->i_pts;
     pic_out->i_dts = h->fdec->i_dts;

diff --git a/x264.h b/x264.h
index 8f505b12cae22f94658cea00a7acaa3436663384..748fca7b47247c6328380bd9b2bd20fe4e7c1805 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -41,7 +41,7 @@
 
 #include "x264_config.h"
 
-#define X264_BUILD 113
+#define X264_BUILD 114
 
 /* x264_t:
  *      opaque handler for encoder */
@@ -678,7 +678,8 @@ typedef struct
     /* In: force quantizer for != X264_QP_AUTO */
     int     i_qpplus1;
     /* In: pic_struct, for pulldown/doubling/etc...used only if b_pic_struct=1.
-     *     use pic_struct_e for pic_struct inputs */
+     *     use pic_struct_e for pic_struct inputs
+     * Out: pic_struct element associated with frame */
     int     i_pic_struct;
     /* Out: whether this frame is a keyframe.  Important when using modes that result in
      * SEI recovery points being used instead of IDR frames. */