[Mplayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.78,1.79 vd_ffmpeg.c,1.105,1.106

[D Richard Felker III]

On Mon, Oct 20, 2003 at 11:22:43PM +0200, Michael Niedermayer CVS wrote:
> Update of /cvsroot/mplayer/main/libmpcodecs
> In directory mail:/var/tmp.root/cvs-serv21418
> 
> Modified Files:
> 	ve_lavc.c vd_ffmpeg.c 
> Log Message:
> sample_aspect_ratio
> 
> 
> Index: ve_lavc.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
> retrieving revision 1.78
> retrieving revision 1.79
> diff -u -r1.78 -r1.79
> --- ve_lavc.c	7 Oct 2003 11:45:09 -0000	1.78
> +++ ve_lavc.c	20 Oct 2003 21:21:42 -0000	1.79
> @@ -445,7 +445,11 @@
>  	}
>  
>  	if (e && ratio > 0.1 && ratio < 10.0) {
> +#if LIBAVCODEC_BUILD >= 4687
> +	    lavc_venc_context->sample_aspect_ratio= av_d2q(ratio * height / width, 30000);
> +#else
>  	    lavc_venc_context->aspect_ratio= ratio;
> +#endif
>  	    mp_dbg(MSGT_MENCODER, MSGL_DBG2, "aspect_ratio: %f\n", ratio);
>  	} else {
>  	    mp_dbg(MSGT_MENCODER, MSGL_ERR, "aspect ratio: cannot parse \"%s\"\n", lavc_param_aspect);
> @@ -453,7 +457,11 @@
>  	}
>      }
>      else if (lavc_param_autoaspect)
> +#if LIBAVCODEC_BUILD >= 4687
> +	lavc_venc_context->sample_aspect_ratio = av_d2q((float)d_width/d_height*height / width, 30000);
> +#else
>  	lavc_venc_context->aspect_ratio = (float)d_width/d_height;
> +#endif

Since this commit, autoaspect seems broken.

Rich