diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
commit | dd888b05ff3af1c6c35582e75bedae687d38fc66 (patch) | |
tree | 7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /av_opts.h | |
parent | 0406d951209df261970424256d76f293649ec140 (diff) | |
parent | 85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff) | |
download | mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2 mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz |
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
Diffstat (limited to 'av_opts.h')
-rw-r--r-- | av_opts.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -19,7 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef MPLAYER_AV_OPTS_H +#define MPLAYER_AV_OPTS_H + /** * Parses str and sets AVOptions in v accordingly. */ int parse_avopts(void *v, char *str); + +#endif /* MPLAYER_AV_OPTS_H */ |