From 41d0eb1c81c0d266824dfdbd040a54a6afeec81a Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 3 Feb 2011 14:58:59 +0100
Subject: [PATCH] lavc: remove the FF_API_SET_STRING_OLD cruft.

---
 cmdutils.c           |  2 +-
 ffmpeg.c             |  2 +-
 ffplay.c             |  2 +-
 ffprobe.c            |  2 +-
 ffserver.c           |  2 +-
 libavcodec/opt.c     | 16 ---------------
 libavcodec/opt.h     | 49 --------------------------------------------
 libavcodec/version.h |  3 ---
 libswscale/options.c |  2 +-
 9 files changed, 6 insertions(+), 74 deletions(-)
 delete mode 100644 libavcodec/opt.h

diff --git a/cmdutils.c b/cmdutils.c
index cc10b48e30..f1cbd55373 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -38,7 +38,7 @@
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/eval.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include "cmdutils.h"
 #include "version.h"
 #if CONFIG_NETWORK
diff --git a/ffmpeg.c b/ffmpeg.c
index 1ffb21102b..f5244d98fd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -34,7 +34,7 @@
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include "libavcodec/audioconvert.h"
 #include "libavutil/audioconvert.h"
 #include "libavutil/parseutils.h"
diff --git a/ffplay.c b/ffplay.c
index bd8a985eb5..766d5caf9c 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -35,7 +35,7 @@
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
 #include "libavcodec/audioconvert.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include "libavcodec/avfft.h"
 
 #if CONFIG_AVFILTER
diff --git a/ffprobe.c b/ffprobe.c
index 6c672e7623..cc3699bf9b 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -23,7 +23,7 @@
 
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavdevice/avdevice.h"
 #include "cmdutils.h"
diff --git a/ffserver.c b/ffserver.c
index 079be03994..ec8b773c26 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -40,7 +40,7 @@
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
 #include "libavutil/parseutils.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include <stdarg.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 3b89a3013c..f2bff96380 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -64,19 +64,3 @@ FF_SYMVER(void, av_opt_set_defaults2, (void *s, int mask, int flags), "LIBAVCODE
     return av_opt_set_defaults2(s, mask, flags);
 }
 #endif
-
-#if FF_API_SET_STRING_OLD
-const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
-    const AVOption *o;
-    if (av_set_string3(obj, name, val, alloc, &o) < 0)
-        return NULL;
-    return o;
-}
-
-const AVOption *av_set_string(void *obj, const char *name, const char *val){
-    const AVOption *o;
-    if (av_set_string3(obj, name, val, 0, &o) < 0)
-        return NULL;
-    return o;
-}
-#endif
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
deleted file mode 100644
index ece54aad24..0000000000
--- a/libavcodec/opt.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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
- * 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.
- *
- * 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 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
- */
-
-#include "libavutil/rational.h"
-#include "avcodec.h"
-#include "libavutil/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);
-
-/**
- * @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
-
-#endif /* AVCODEC_OPT_H */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 5c81e3a671..679a38e7e5 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -41,9 +41,6 @@
 #ifndef FF_API_PALETTE_CONTROL
 #define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif
-#ifndef FF_API_SET_STRING_OLD
-#define FF_API_SET_STRING_OLD   (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_INOFFICIAL
 #define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)
 #endif
diff --git a/libswscale/options.c b/libswscale/options.c
index 59b99943db..7cee46076f 100644
--- a/libswscale/options.c
+++ b/libswscale/options.c
@@ -20,7 +20,7 @@
 
 #include "libavutil/avutil.h"
 #include "libavutil/pixfmt.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include "swscale.h"
 #include "swscale_internal.h"