From d4be08e0c9fc9ed2862e952a489ef6a8943b5e5d Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 29 Aug 2008 17:37:32 +0000 Subject: [PATCH] Make X264_init() no longer assign avctx->rc_eq to libx264's context. Fix a crash due to X264_init() setting the libx264 rc_eq field to NULL when rc_eq was not defined. As a consequence rc_eq can no longer be manually specified and passed to libx264, but this option is going to be removed from the libx264 public API anyway. See the thread: "Fix crash in libx264 when rc_eq is not set". Originally committed as revision 15029 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/libx264.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e885f074f5..266ab39d66 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -253,7 +253,6 @@ X264_init(AVCodecContext *avctx) x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor); x4->params.rc.f_pb_factor = avctx->b_quant_factor; x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; - x4->params.rc.psz_rc_eq = avctx->rc_eq; x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR; x4->params.i_log_level = X264_LOG_DEBUG;