aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-04-19 15:23:36 -0700
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-04-19 15:25:07 -0700
commit37c0a443f9aa01fcf33215b3cde06961f1e9df5c (patch)
treeeebe5d60d172aa0519caebd1f3675880d608397c
parent90a29294169d8bc57dec2e0b600fe50c101ed625 (diff)
downloadffmpeg-37c0a443f9aa01fcf33215b3cde06961f1e9df5c.tar.gz
Fix libx264 fastfirstpass, move apply_fastfirstpass after user customized options.
-rw-r--r--libavcodec/libx264.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 5b20d35464..0ef42cd9ad 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;