summaryrefslogtreecommitdiffstats
path: root/av_opts.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-26 00:58:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-26 00:58:15 +0200
commitdd888b05ff3af1c6c35582e75bedae687d38fc66 (patch)
tree7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /av_opts.h
parent0406d951209df261970424256d76f293649ec140 (diff)
parent85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff)
downloadmpv-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.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/av_opts.h b/av_opts.h
index a9eab9c8a5..640443a352 100644
--- a/av_opts.h
+++ b/av_opts.h
@@ -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 */