# HG changeset patch # User alex # Date 1009191251 0 # Node ID e16996f5497d1e495356174b0323fb353d1c826e # Parent a33d0351630e97929e54e65eaf72737972116e87 supporting -ofps by lavc, using avcodec_find_encoder_by_name (latest libavcodec cvs) diff -r a33d0351630e -r e16996f5497d mencoder.c --- a/mencoder.c Mon Dec 24 10:39:28 2001 +0000 +++ b/mencoder.c Mon Dec 24 10:54:11 2001 +0000 @@ -807,7 +807,7 @@ avcodec_inited=1; } -#if 1 +#if 0 { extern AVCodec *first_avcodec; AVCodec *p = first_avcodec; @@ -836,13 +836,14 @@ // lavc_venc_context.width = mux_v->bih->biWidth; // lavc_venc_context.height = mux_v->bih->biHeight; + /* scaling only for YV12 (and lavc supports only YV12 ;) */ lavc_venc_context.width = vo_w; lavc_venc_context.height = vo_h; if (lavc_param_vbitrate >= 0) /* != -1 */ lavc_venc_context.bit_rate = lavc_param_vbitrate; else lavc_venc_context.bit_rate = 800000; /* default */ - lavc_venc_context.frame_rate = sh_video->fps * FRAME_RATE_BASE; + lavc_venc_context.frame_rate = (float)(force_ofps?force_ofps:sh_video->fps) * FRAME_RATE_BASE; /* keyframe interval */ if (lavc_param_keyint >= 0) /* != -1 */ lavc_venc_context.gop_size = lavc_param_keyint;