[MPlayer-cvslog] r32008 - in trunk: Makefile libmpcodecs/dec_video.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c mencoder.c mplayer.c

[Diego Biurrun]

On Mon, Aug 23, 2010 at 09:13:05PM +0200, cigaes wrote:
> 
> Log:
> EOSD/ASS code factorization
> Move some code that was partially duplicated between vf_vo and vf_ass with
> subtle differences into a separate file.
> 
> --- trunk/libmpcodecs/vf_ass.c	Mon Aug 23 01:38:40 2010	(r32007)
> +++ trunk/libmpcodecs/vf_ass.c	Mon Aug 23 21:13:05 2010	(r32008)
> @@ -39,10 +39,12 @@
>  
>  #include "libvo/fastmemcpy.h"
>  #include "libvo/sub.h"
> +#include "libvo/video_out.h"

This looks unnecessary.

> --- trunk/mencoder.c	Mon Aug 23 01:38:40 2010	(r32007)
> +++ trunk/mencoder.c	Mon Aug 23 21:13:05 2010	(r32008)
> @@ -1052,10 +1053,11 @@ default: {
>  
>      sh_video->vfilter=append_filters(sh_video->vfilter);
> +  eosd_init(sh_video->vfilter);

Indentation is off.

Diego