On Wed, 20 Apr 2011 15:56:16 -0700, Aℓex Converse <aconve...@google.com> wrote: > On Wed, Apr 20, 2011 at 3:40 PM, Alex Converse <aconve...@google.com> wrote: > > --- > > libavcodec/libx264.c | 14 +++++++------- > > 1 files changed, 7 insertions(+), 7 deletions(-) > > > > > From abb44bdc8e25a75c3beaf47fd23bc9ca48490ccc Mon Sep 17 00:00:00 2001 > From: Baptiste Coudurier <baptiste.coudur...@gmail.com> > Date: Tue, 19 Apr 2011 15:23:36 -0700 > Subject: [PATCH 4/6] Fix libx264 fastfirstpass, move apply_fastfirstpass > after user customized options. > (cherry picked from commit 37c0a443f9aa01fcf33215b3cde06961f1e9df5c) > MIME-Version: 1.0 > Content-Type: multipart/mixed; boundary="------------1" > > This is a multi-part message in MIME format. > --------------1 > Content-Type: text/plain; charset=UTF-8; format=fixed > Content-Transfer-Encoding: 8bit > > --- > libavcodec/libx264.c | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > > --------------1 > Content-Type: text/x-patch; > name="0004-Fix-libx264-fastfirstpass-move-apply_fastfirstpass-a.patch" > Content-Transfer-Encoding: 8bit > Content-Disposition: attachment; > filename="0004-Fix-libx264-fastfirstpass-move-apply_fastfirstpass-a.patch" > > diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c > index 82f769a..5971b74 100644 > --- a/libavcodec/libx264.c > +++ b/libavcodec/libx264.c > @@ -262,13 +262,6 @@ static av_cold int X264_init(AVCodecContext *avctx) > return -1; > } > > - if (x4->fastfirstpass) > - x264_param_apply_fastfirstpass(&x4->params); > - > - if (x4->profile) > - if (x264_param_apply_profile(&x4->params, x4->profile) < 0) > - return -1; > - > x4->params.pf_log = X264_log; > x4->params.p_log_private = avctx; > x4->params.i_log_level = X264_LOG_DEBUG; > @@ -302,6 +295,13 @@ static av_cold int X264_init(AVCodecContext *avctx) > (float)avctx->rc_initial_buffer_occupancy / > avctx->rc_buffer_size; > } > > + if (x4->fastfirstpass) > + x264_param_apply_fastfirstpass(&x4->params); > + > + if (x4->profile) > + if (x264_param_apply_profile(&x4->params, x4->profile) < 0) > + return -1; > + > x4->params.i_width = avctx->width; > x4->params.i_height = avctx->height; > x4->params.vui.i_sar_width = avctx->sample_aspect_ratio.num; >
This looks like it should be squashed with 1. -- Anton Khirnov _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
