# HG changeset patch # User diego # Date 1270304434 0 # Node ID e4c7703dd90197dd8ad5b3360e0b059b7f36c4d0 # Parent 24b8498ff7868d2005694c1b5b2c476873403876 Add a header for x264enc_set_param() instead of forward declaring it. diff -r 24b8498ff786 -r e4c7703dd901 cfg-mencoder.h --- a/cfg-mencoder.h Sat Apr 03 13:51:14 2010 +0000 +++ b/cfg-mencoder.h Sat Apr 03 14:20:34 2010 +0000 @@ -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 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[]; diff -r 24b8498ff786 -r e4c7703dd901 libmpcodecs/ve_x264.c --- a/libmpcodecs/ve_x264.c Sat Apr 03 13:51:14 2010 +0000 +++ b/libmpcodecs/ve_x264.c Sat Apr 03 14:20:34 2010 +0000 @@ -45,6 +45,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" +#include "ve_x264.h" #include diff -r 24b8498ff786 -r e4c7703dd901 libmpcodecs/ve_x264.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpcodecs/ve_x264.h Sat Apr 03 14:20:34 2010 +0000 @@ -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 */