[Mplayer-cvslog] CVS: main mencoder.c,1.241,1.242

[D Richard Felker III]

On Wed, Apr 28, 2004 at 06:02:49AM +0200, Richard Felker CVS wrote:
> CVS change done by Richard Felker CVS
> 
> Update of /cvsroot/mplayer/main
> In directory mail:/var2/tmp/cvs-serv2959
> 
> Modified Files:
> 	mencoder.c 
> Log Message:
> "hard" frame duplication for mencoder. this finally makes it possible
> to generate valid mpeg output from avi's that have duplicate frames in
> them, or when using inverse telecine filters. to use it, put the
> "harddup" filter at the end of your filter chain.
> 
> 
> 
> Index: mencoder.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/mencoder.c,v
> retrieving revision 1.241
> retrieving revision 1.242
> diff -u -r1.241 -r1.242
> --- mencoder.c	17 Apr 2004 16:46:40 -0000	1.241
> +++ mencoder.c	28 Apr 2004 04:02:46 -0000	1.242
> @@ -189,6 +189,7 @@
>  #endif
>  
>  int auto_expand=1;
> +int encode_duplicates=1;
>  
>  // infos are empty by default
>  char *info_name=NULL;
> @@ -1312,7 +1313,8 @@
>  	if(file_format != DEMUXER_TYPE_TV && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag);
>      while(skip_flag<0){
>  	duplicatedframes++;
> -	muxer_write_chunk(mux_v,0,0);
> +	if (!encode_duplicates || vf_next_control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE)
> +	    muxer_write_chunk(mux_v,0,0);

Before anyone flames about the default being enabled, note that the
old behavior still takes place as long as the filters/ve do not handle
VFCTRL_DUPLICATE_FRAME (and only vf_harddup handles it!).

Also I forgot to commit vf.h, doing that now. :)

Rich