[MPlayer-cvslog] r31443 - in trunk: cfg-mencoder.h libmpdemux/muxer_avi.c libmpdemux/muxer_avi.h

[diego]

Author: diego
Date: Thu Jun 17 10:28:43 2010
New Revision: 31443

Log:
Add header file for the extern declarations from muxer_avi.c.

Added:
   trunk/libmpdemux/muxer_avi.h
Modified:
   trunk/cfg-mencoder.h
   trunk/libmpdemux/muxer_avi.c

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	Thu Jun 17 10:22:21 2010	(r31442)
+++ trunk/cfg-mencoder.h	Thu Jun 17 10:28:43 2010	(r31443)
@@ -24,6 +24,7 @@
  */
 
 #include "libmpcodecs/ve_x264.h"
+#include "libmpdemux/muxer_avi.h"
 #include "cfg-common.h"
 
 extern const m_option_t faacopts_conf[];
@@ -166,9 +167,6 @@ const m_option_t of_conf[]={
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-extern float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */
-extern int write_odml; /* defined in libmpdemux/muxer_avi.c */
-
 const m_option_t mencoder_opts[]={
     /* name, pointer, type, flags, min, max */
 

Modified: trunk/libmpdemux/muxer_avi.c
==============================================================================
--- trunk/libmpdemux/muxer_avi.c	Thu Jun 17 10:22:21 2010	(r31442)
+++ trunk/libmpdemux/muxer_avi.c	Thu Jun 17 10:28:43 2010	(r31443)
@@ -29,7 +29,7 @@
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-
+#include "muxer_avi.h"
 #include "muxer.h"
 #include "aviheader.h"
 #include "ms_hdr.h"

Added: trunk/libmpdemux/muxer_avi.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/muxer_avi.h	Thu Jun 17 10:28:43 2010	(r31443)
@@ -0,0 +1,25 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_MUXER_AVI_H
+#define MPLAYER_MUXER_AVI_H
+
+extern float avi_aspect_override;
+extern int write_odml;
+
+#endif /* MPLAYER_MUXER_AVI_H */