Commit f9a4c4d9 authored by Kieran Kunhya's avatar Kieran Kunhya Committed by Fiona Glaser
Browse files

Pass through user data

parent 1c774e93
......@@ -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];
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment