From 4cb3939a0bb8ff66b252669f91fb832804565c40 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Mon, 27 Oct 2008 17:01:22 +0000 Subject: ext/x264/gstx264enc.c: Adapt to slightly modified x264 API. Fixes #555238. Original commit message from CVS: * ext/x264/gstx264enc.c: (gst_x264_enc_init_encoder): Adapt to slightly modified x264 API. Fixes #555238. --- ChangeLog | 5 +++++ ext/x264/gstx264enc.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 98624b41..0a3e49b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-27 Mark Nauwelaerts + + * ext/x264/gstx264enc.c: (gst_x264_enc_init_encoder): + Adapt to slightly modified x264 API. Fixes #555238. + 2008-10-27 Mark Nauwelaerts * ext/faac/gstfaac.c: (gst_faac_sink_event): diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 0aa4c751..75d38164 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -541,7 +541,12 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder) encoder->x264param.i_frame_reference = encoder->ref; encoder->x264param.i_bframe = encoder->bframes; encoder->x264param.b_bframe_pyramid = encoder->b_pyramid; +#if X264_BUILD < 63 encoder->x264param.b_bframe_adaptive = encoder->b_adapt; +#else + encoder->x264param.i_bframe_adaptive = + encoder->b_adapt ? X264_B_ADAPT_FAST : X264_B_ADAPT_NONE; +#endif encoder->x264param.b_interlaced = encoder->interlaced; encoder->x264param.b_deblocking_filter = 1; encoder->x264param.i_deblocking_filter_alphac0 = 0; -- cgit v1.2.1