Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / opt.h

diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index 95147595b7fb8f5d3909d5b580fd92b5b1d61e17..2380e74332c282a88d4ce650a7f1d25ec14087d4 100644 (file)
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -1,55 +1,34 @@
 /*
- * AVOptions
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ * This file is part of Libav.
  *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * 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 */