Pass through user data

diff --git a/common/frame.c b/common/frame.c
index 2da507bba14dbf8c9401589309faab79b08dce71..2c38b660eee3ec81f940a3c1fba76edf150136c1 100644 (file)
--- a/common/frame.c
+++ b/common/frame.c
@@ -353,6 +353,7 @@ int x264_frame_copy_picture( x264_t *h, x264_frame_t *dst, x264_picture_t *src )
     dst->param      = src->param;
     dst->i_pic_struct = src->i_pic_struct;
     dst->extra_sei  = src->extra_sei;
+    dst->opaque     = src->opaque;
 
     uint8_t *pix[3];
     int stride[3];

diff --git a/common/frame.h b/common/frame.h
index a13e05b4a27b25242d9965c94609cd5b34d41b44..2781a717eb6bf6c6a5bab2271fba1864c68ebfce 100644 (file)
--- a/common/frame.h
+++ b/common/frame.h
@@ -162,6 +162,9 @@ typedef struct x264_frame
 
     /* user sei */
     x264_sei_t extra_sei;
+
+    /* user data */
+    void *opaque;
 } x264_frame_t;
 
 /* synchronized frame list */

diff --git a/encoder/encoder.c b/encoder/encoder.c
index e253463e982b90595bf3d4715e0dfcd242ea2dc0..65ab5c387fe1504602aef7563e06b5ddcd1b9ae0 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -3108,6 +3108,8 @@ static int x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
     if( pic_out->i_pts < pic_out->i_dts )
         x264_log( h, X264_LOG_WARNING, "invalid DTS: PTS is less than DTS\n" );
 
+    pic_out->opaque = h->fenc->opaque;
+
     pic_out->img.i_csp = h->fdec->i_csp;
 #if HIGH_BIT_DEPTH
     pic_out->img.i_csp |= X264_CSP_HIGH_DEPTH;

diff --git a/x264.h b/x264.h
index 20497a6f192b5b4cd89df4104d037e0a6a5dbe83..afe4c403384a9ee5a14a06741d3060f5139c95c5 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -41,7 +41,7 @@
 
 #include "x264_config.h"
 
-#define X264_BUILD 119
+#define X264_BUILD 120
 
 /* x264_t:
  *      opaque handler for encoder */
@@ -724,8 +724,7 @@ typedef struct
     x264_hrd_t hrd_timing;
     /* In: arbitrary user SEI (e.g subtitles, AFDs) */
     x264_sei_t extra_sei;
-    /* private user data. libx264 doesn't touch this,
-       not even copy it from input to output frames. */
+    /* private user data. copied from input to output frames. */
     void *opaque;
 } x264_picture_t;