Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / opt.h

diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index cf5435409623e30ccb55c21b36ec68309c243720..2380e74332c282a88d4ce650a7f1d25ec14087d4 100644 (file)
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -1,7 +1,4 @@
 /*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -19,37 +16,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_OPT_H
-#define AVCODEC_OPT_H
-
 /**
  * @file
- * AVOptions
+ * This header is provided for compatibility only and will be removed
+ * on next major bump
  */
 
-#include "libavutil/rational.h"
-#include "avcodec.h"
-#include "libavutil/opt.h"
+#ifndef AVCODEC_OPT_H
+#define AVCODEC_OPT_H
 
-#if FF_API_SET_STRING_OLD
-/**
- * @see av_set_string2()
- */
-attribute_deprecated const AVOption *av_set_string(void *obj, const char *name, const char *val);
+#include "libavcodec/version.h"
 
-/**
- * @return a pointer to the AVOption corresponding to the field set or
- * NULL if no matching AVOption exists, or if the value val is not
- * valid
- * @see av_set_string3()
- */
-attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc);
-#endif
-#if FF_API_OPT_SHOW
-/**
- * @deprecated Use av_opt_show2() instead.
- */
-attribute_deprecated int av_opt_show(void *obj, void *av_log_obj);
+#if FF_API_OPT_H
+#include "libavutil/opt.h"
 #endif
 
 #endif /* AVCODEC_OPT_H */