[MPlayer-cvslog] r30991 - in trunk: cfg-mencoder.h libmpcodecs/ve_x264.c libmpcodecs/ve_x264.h

[diego]

Author: diego
Date: Sat Apr  3 16:20:34 2010
New Revision: 30991

Log:
Add a header for x264enc_set_param() instead of forward declaring it.

Added:
   trunk/libmpcodecs/ve_x264.h
Modified:
   trunk/cfg-mencoder.h
   trunk/libmpcodecs/ve_x264.c

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	Sat Apr  3 15:51:14 2010	(r30990)
+++ trunk/cfg-mencoder.h	Sat Apr  3 16:20:34 2010	(r30991)
@@ -23,6 +23,7 @@
  * config for cfgparser
  */
 
+#include "libmpcodecs/ve_x264.h"
 #include "cfg-common.h"
 
 extern int sws_flags;
@@ -35,9 +36,6 @@ extern m_option_t twolameopts_conf[];
 extern m_option_t faacopts_conf[];
 extern m_option_t vfwopts_conf[];
 extern m_option_t xvidencopts_conf[];
-
-void x264enc_set_param(const m_option_t* opt, char* arg);
-
 extern m_option_t nuvopts_conf[];
 extern m_option_t mpegopts_conf[];
 extern m_option_t lavfopts_conf[];

Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c	Sat Apr  3 15:51:14 2010	(r30990)
+++ trunk/libmpcodecs/ve_x264.c	Sat Apr  3 16:20:34 2010	(r30991)
@@ -45,6 +45,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
+#include "ve_x264.h"
 
 #include <x264.h>
 

Added: trunk/libmpcodecs/ve_x264.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpcodecs/ve_x264.h	Sat Apr  3 16:20:34 2010	(r30991)
@@ -0,0 +1,26 @@
+/*
+ * 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_X264_H
+#define MPLAYER_X264_H
+
+#include "m_option.h"
+
+void x264enc_set_param(const m_option_t* opt, char* arg);
+
+#endif /* MPLAYER_X264_H */