[MPlayer-cvslog] CVS: main mencoder.c,1.265,1.266

[D Richard Felker III]

On Fri, Feb 25, 2005 at 08:43:42AM +0100, Zoltan Hidvegi CVS wrote:
> CVS change done by Zoltan Hidvegi CVS
> 
> Update of /cvsroot/mplayer/main
> In directory mail:/var2/tmp/cvs-serv21795
> 
> Modified Files:
> 	mencoder.c 
> Log Message:
> Always print dup/skip messages when !quiet.
> 
> Index: mencoder.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/mencoder.c,v
> retrieving revision 1.265
> retrieving revision 1.266
> diff -u -r1.265 -r1.266
> --- mencoder.c	25 Feb 2005 02:32:29 -0000	1.265
> +++ mencoder.c	25 Feb 2005 07:43:40 -0000	1.266
> @@ -1580,7 +1580,7 @@
>  
>  if(skip_flag<0){
>      // duplicate frame
> -	if(file_format != DEMUXER_TYPE_TV && !verbose) mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DuplicateFrames,-skip_flag);
> +	if(file_format != DEMUXER_TYPE_TV && !quiet) mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_DuplicateFrames,-skip_flag);
>      while(skip_flag<0){
>  	duplicatedframes++;
>  	if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE)
> @@ -1590,7 +1590,7 @@
>  } else
>  if(skip_flag>0){
>      // skip frame
> -	if(file_format != DEMUXER_TYPE_TV && !verbose) mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_SkipFrame);
> +	if(file_format != DEMUXER_TYPE_TV && !quiet) mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_SkipFrame);
>  	skippedframes++;
>      --skip_flag;
>  }

hmm, why are the messages hidden when using tv-in?
does this mean mencoder does broken frame skipping or duplication when
capturing from tv too, and just hides it from us? that would be _very_
bad, since duplication of an interlaced 'frame' results in total
nonsense.

rich