aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libx264.c
diff options
context:
space:
mode:
authorJason Garrett-Glaser <darkshikari@gmail.com>2009-11-24 15:49:34 +0000
committerJason Garrett-Glaser <darkshikari@gmail.com>2009-11-24 15:49:34 +0000
commit096c87f667ab8cdfc4fd290c80421a80c842adca (patch)
tree020f28c639f7d2578e375e3a056580056935202f /libavcodec/libx264.c
parentf3bdc3da15e3c794f226f915656049bd01fbb871 (diff)
downloadffmpeg-096c87f667ab8cdfc4fd290c80421a80c842adca.tar.gz
Add weightp support in API for libx264.
ffmpeg can encode baseline profile again. Originally committed as revision 20600 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libx264.c')
-rw-r--r--libavcodec/libx264.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 3a3f1e5176..05c29805db 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -228,6 +228,7 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.analyse.i_direct_mv_pred = avctx->directpred;
x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED;
+ x4->params.analyse.i_weighted_pred = avctx->weighted_p_pred;
if (avctx->me_method == ME_EPZS)
x4->params.analyse.i_me_method = X264_ME_DIA;