[MPlayer-cvslog] r32148 - in trunk: libmpcodecs/ve_lavc.c libmpcodecs/ve_x264.c libmpcodecs/ve_xvid4.c libmpdemux/muxer_avi.c libmpdemux/muxer_lavf.c mencoder.c mencoder.h

[diego]

Author: diego
Date: Sat Sep 11 13:47:07 2010
New Revision: 32148

Log:
Move all MEncoder-related extern variable declarations to mencoder.h.

Added:
   trunk/mencoder.h
Modified:
   trunk/libmpcodecs/ve_lavc.c
   trunk/libmpcodecs/ve_x264.c
   trunk/libmpcodecs/ve_xvid4.c
   trunk/libmpdemux/muxer_avi.c
   trunk/libmpdemux/muxer_lavf.c
   trunk/mencoder.c

Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c	Sat Sep 11 13:43:05 2010	(r32147)
+++ trunk/libmpcodecs/ve_lavc.c	Sat Sep 11 13:47:07 2010	(r32148)
@@ -29,7 +29,7 @@
 #endif
 
 #include "config.h"
-
+#include "mencoder.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "av_opts.h"
@@ -48,8 +48,6 @@
 #include "vf.h"
 #include "vd_ffmpeg.h"
 
-extern char* passtmpfile;
-
 //===========================================================================//
 
 #include "libavcodec/avcodec.h"

Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c	Sat Sep 11 13:43:05 2010	(r32147)
+++ trunk/libmpcodecs/ve_x264.c	Sat Sep 11 13:47:07 2010	(r32148)
@@ -32,7 +32,7 @@
 
 #include "config.h"
 #include "mp_msg.h"
-
+#include "mencoder.h"
 #include "m_option.h"
 #include "codec-cfg.h"
 #include "stream/stream.h"
@@ -55,7 +55,6 @@ typedef struct h264_module_t {
     x264_picture_t  pic;
 } h264_module_t;
 
-extern char* passtmpfile;
 static x264_param_t param;
 static int parse_error = 0;
 

Modified: trunk/libmpcodecs/ve_xvid4.c
==============================================================================
--- trunk/libmpcodecs/ve_xvid4.c	Sat Sep 11 13:43:05 2010	(r32147)
+++ trunk/libmpcodecs/ve_xvid4.c	Sat Sep 11 13:47:07 2010	(r32148)
@@ -35,7 +35,7 @@
 
 #include "config.h"
 #include "mp_msg.h"
-
+#include "mencoder.h"
 #include "codec-cfg.h"
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
@@ -156,8 +156,6 @@ static const profile_t *profileFromName(
  * Configuration options
  ****************************************************************************/
 
-extern char* passtmpfile;
-
 static int xvidenc_bitrate = 0;
 static int xvidenc_pass = 0;
 static float xvidenc_quantizer = 0;

Modified: trunk/libmpdemux/muxer_avi.c
==============================================================================
--- trunk/libmpdemux/muxer_avi.c	Sat Sep 11 13:43:05 2010	(r32147)
+++ trunk/libmpdemux/muxer_avi.c	Sat Sep 11 13:47:07 2010	(r32148)
@@ -24,6 +24,7 @@
 #include <limits.h>
 
 #include "config.h"
+#include "mencoder.h"
 #include "mpcommon.h"
 #include "stream/stream.h"
 #include "demuxer.h"
@@ -35,14 +36,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-extern char *info_name;
-extern char *info_artist;
-extern char *info_genre;
-extern char *info_subject;
-extern char *info_copyright;
-extern char *info_sourceform;
-extern char *info_comment;
-
 /* #define ODML_CHUNKLEN    0x02000000 */ /* for testing purposes */
 #define ODML_CHUNKLEN    0x40000000
 #define ODML_NOTKEYFRAME 0x80000000U

Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c	Sat Sep 11 13:43:05 2010	(r32147)
+++ trunk/libmpdemux/muxer_lavf.c	Sat Sep 11 13:47:07 2010	(r32148)
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-
+#include "mencoder.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 #include "av_opts.h"
@@ -42,14 +42,6 @@
 
 enum PixelFormat imgfmt2pixfmt(int fmt);
 
-extern char *info_name;
-extern char *info_artist;
-extern char *info_genre;
-extern char *info_subject;
-extern char *info_copyright;
-extern char *info_sourceform;
-extern char *info_comment;
-
 #define BIO_BUFFER_SIZE 32768
 
 typedef struct {
@@ -320,7 +312,6 @@ static void list_formats(void) {
 		mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
 }
 
-extern char *out_filename;
 int muxer_init_muxer_lavf(muxer_t *muxer)
 {
 	muxer_priv_t *priv;

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Sat Sep 11 13:43:05 2010	(r32147)
+++ trunk/mencoder.c	Sat Sep 11 13:47:07 2010	(r32148)
@@ -98,6 +98,7 @@
 #include "spudec.h"
 #include "vobsub.h"
 #include "eosd.h"
+#include "mencoder.h"
 
 
 int vo_doublebuffering=0;

Added: trunk/mencoder.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mencoder.h	Sat Sep 11 13:47:07 2010	(r32148)
@@ -0,0 +1,32 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_MENCODER_H
+#define MPLAYER_MENCODER_H
+
+extern char *info_artist;
+extern char *info_comment;
+extern char *info_copyright;
+extern char *info_genre;
+extern char *info_name;
+extern char *info_sourceform;
+extern char *info_subject;
+extern char *out_filename;
+extern char *passtmpfile;
+
+#endif /* MPLAYER_MENCODER_H */