diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2008-10-27 17:01:22 +0000 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2008-10-27 17:01:22 +0000 |
| commit | 4cb3939a0bb8ff66b252669f91fb832804565c40 (patch) | |
| tree | 76618ffc7e1aa5620f152976fd777590f824f49d | |
| parent | c7b374abcb2c78be35a75a9db8ecb18496d444a6 (diff) | |
| download | gst-plugins-bad-4cb3939a0bb8ff66b252669f91fb832804565c40.tar.gz gst-plugins-bad-4cb3939a0bb8ff66b252669f91fb832804565c40.tar.bz2 gst-plugins-bad-4cb3939a0bb8ff66b252669f91fb832804565c40.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/x264/gstx264enc.c | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2008-10-27 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + * ext/x264/gstx264enc.c: (gst_x264_enc_init_encoder): + Adapt to slightly modified x264 API. Fixes #555238. + +2008-10-27 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + * ext/faac/gstfaac.c: (gst_faac_sink_event): Prevent endless loop if buffer alloc error. 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; |