diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-30 22:41:41 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-30 22:41:41 +0000 |
| commit | 4cd5847495b35b34b05d6d4facd22d00380ee950 (patch) | |
| tree | 4de1604472c11d7d9a2e48989fb3da7f8bc170e5 /libmpcodecs | |
| parent | c43a428c451cb8db8279c57bf7624846da416477 (diff) | |
| download | mpv-4cd5847495b35b34b05d6d4facd22d00380ee950.tar.bz2 mpv-4cd5847495b35b34b05d6d4facd22d00380ee950.tar.xz | |
LIBAVCODEC_BUILD >= 4754
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15308 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_lavc.c | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 32b96bb37e..8eef317262 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -349,12 +349,16 @@ static int config(struct vf_instance_s* vf, else lavc_venc_context->bit_rate = 800000; /* default */ lavc_venc_context->bit_rate_tolerance= lavc_param_vrate_tolerance*1000; +#if LIBAVCODEC_BUILD >= 4754 + lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; +#else #if LIBAVCODEC_BUILD >= 4662 lavc_venc_context->frame_rate = mux_v->h.dwRate; lavc_venc_context->frame_rate_base = mux_v->h.dwScale; #else lavc_venc_context->frame_rate = mux_v->h.dwRate*FRAME_RATE_BASE/mux_v->h.dwScale; #endif +#endif lavc_venc_context->qmin= lavc_param_vqmin; lavc_venc_context->qmax= lavc_param_vqmax; #if LIBAVCODEC_BUILD >= 4646 diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c index cc1420405c..7bad7581c3 100644 --- a/libmpcodecs/vf_lavc.c +++ b/libmpcodecs/vf_lavc.c @@ -61,27 +61,39 @@ static int config(struct vf_instance_s* vf, lavc_venc_context.width = width; lavc_venc_context.height = height; +#if LIBAVCODEC_BUILD >= 4754 + if(!lavc_venc_context.time_base.num){ +#else if(!lavc_venc_context.frame_rate){ +#endif // guess FPS: switch(height){ case 240: case 480: +#if LIBAVCODEC_BUILD >= 4754 + lavc_venc_context.time_base= (AVRational){1001,30000}; +#else #if LIBAVCODEC_BUILD >= 4662 lavc_venc_context.frame_rate = 30000; lavc_venc_context.frame_rate_base= 1001; #else lavc_venc_context.frame_rate=29.97*FRAME_RATE_BASE; // NTSC #endif +#endif break; case 576: case 288: default: +#if LIBAVCODEC_BUILD >= 4754 + lavc_venc_context.time_base= (AVRational){1,25}; +#else #if LIBAVCODEC_BUILD >= 4662 lavc_venc_context.frame_rate = 25; lavc_venc_context.frame_rate_base= 1; #else lavc_venc_context.frame_rate=25*FRAME_RATE_BASE; // PAL #endif +#endif break; // lavc_venc_context.frame_rate=vo_fps*FRAME_RATE_BASE; // same as src } @@ -191,12 +203,17 @@ static int open(vf_instance_t *vf, char* args){ // fixed bitrate (in kbits) lavc_venc_context.bit_rate = 1000*p_quality; } +#if LIBAVCODEC_BUILD >= 4754 + lavc_venc_context.time_base.num = 1000*1001; + lavc_venc_context.time_base.den = (p_fps<1.0) ? 0 : (p_fps * lavc_venc_context.time_base.num); +#else #if LIBAVCODEC_BUILD >= 4662 lavc_venc_context.frame_rate_base = 1000*1001; lavc_venc_context.frame_rate = (p_fps<1.0) ? 0 : (p_fps * lavc_venc_context.frame_rate_base); #else lavc_venc_context.frame_rate = (p_fps<1.0) ? 0 : (p_fps * FRAME_RATE_BASE); #endif +#endif lavc_venc_context.gop_size = 0; // I-only return 1; |