[MPlayer-cvslog] r24397 - in trunk: cfg-common.h mencoder.c

[diego]

Author: diego
Date: Mon Sep 10 12:57:40 2007
New Revision: 24397

Log:
warning fix:
cfg-common.h:347: warning: redundant redeclaration of 'vd_use_slices'
libmpcodecs/vd.h:19: warning: previous declaration of 'vd_use_slices' was here


Modified:
   trunk/cfg-common.h
   trunk/mencoder.c

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	(original)
+++ trunk/cfg-common.h	Mon Sep 10 12:57:40 2007
@@ -344,7 +344,6 @@ extern float screen_size_xy;
 extern float movie_aspect;
 extern int softzoom;
 extern int flip;
-extern int vd_use_slices;
 
 /* defined in codec-cfg.c */
 extern char * codecs_file;

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Mon Sep 10 12:57:40 2007
@@ -65,6 +65,7 @@
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/vf.h"
+#include "libmpcodecs/vd.h"
 
 // for MPEGLAYER3WAVEFORMAT:
 #include "libmpdemux/ms_hdr.h"