diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-03 14:20:34 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-03 14:20:34 +0000 |
| commit | ff93cd656b417416914adc656d8f7ab028cd7472 (patch) | |
| tree | fd80dd6e61ed67bfda1d31368969342e0955a176 | |
| parent | 8b4b82d008bd29c0d26006bf04887a2915a41e0b (diff) | |
| download | mpv-ff93cd656b417416914adc656d8f7ab028cd7472.tar.bz2 mpv-ff93cd656b417416914adc656d8f7ab028cd7472.tar.xz | |
Add a header for x264enc_set_param() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-mencoder.h | 4 | ||||
| -rw-r--r-- | libmpcodecs/ve_x264.c | 1 | ||||
| -rw-r--r-- | libmpcodecs/ve_x264.h | 26 |
3 files changed, 28 insertions, 3 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 98ffc098d8..d9641955a3 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -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[]; diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 3f149f6de6..1c59e84397 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -45,6 +45,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" +#include "ve_x264.h" #include <x264.h> diff --git a/libmpcodecs/ve_x264.h b/libmpcodecs/ve_x264.h new file mode 100644 index 0000000000..93da150514 --- /dev/null +++ b/libmpcodecs/ve_x264.h @@ -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 */ |