summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-21 19:34:06 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-21 19:34:06 +0000
commita21dc05006b721140fefdc70acdd74d8fd0c85f5 (patch)
tree9a6c95548e763b5541605d8dffb719e76176f5b5 /libmpcodecs
parent1730f7a8f43dd2cdb10527623e5cd23e78f0163b (diff)
downloadmpv-a21dc05006b721140fefdc70acdd74d8fd0c85f5.tar.bz2
mpv-a21dc05006b721140fefdc70acdd74d8fd0c85f5.tar.xz
Add a call to x264enc_set_param in config, otherwise mencoder -ovc x264
would crash when no x264encopts specified. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20339 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_x264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index 9c24852055..db1caa9887 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -152,6 +152,8 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
mod->mux->bih->biHeight = height;
mod->mux->aspect = (float)d_width/d_height;
+ // make sure param is initialized
+ x264enc_set_param(NULL, "");
param.i_width = width;
param.i_height = height;
param.i_fps_num = mod->mux->h.dwRate;