diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
commit | c37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch) | |
tree | 44df07eacb522a97bbecd7a3a0f93e8d6a933003 /libvo | |
parent | 22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff) | |
parent | 2aafb808284d74edab6e5320e1114f5c74d5881e (diff) | |
download | mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2 mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz |
Merge svn changes up to r30643
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_zr.c | 2 | ||||
-rw-r--r-- | libvo/vo_zr.h | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index 9b7968a6ba..8ad201a877 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -41,8 +41,8 @@ #include "mp_msg.h" #include "m_option.h" #include "fastmemcpy.h" - #include "jpeg_enc.h" +#include "vo_zr.h" static const vo_info_t info = { diff --git a/libvo/vo_zr.h b/libvo/vo_zr.h new file mode 100644 index 0000000000..ce13f0fb41 --- /dev/null +++ b/libvo/vo_zr.h @@ -0,0 +1,29 @@ +/* + * playback on Zoran cards + * + * 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_VO_ZR_H +#define MPLAYER_VO_ZR_H + +#include "m_option.h" + +int vo_zr_parseoption(const m_option_t *conf, const char *opt, const char *param); +void vo_zr_revertoption(const m_option_t *opt, const char *param); + +#endif /* MPLAYER_VO_ZR_H */ |