From 095290f9a4230698f64c56b5ee9d89c046f6dd5b Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 20 Apr 2011 17:09:45 +0200
Subject: lavc: provide the opt.h header until the next bump

AVOptions were moved to libavutil only recently.
---
 libavcodec/Makefile  |  2 +-
 libavcodec/opt.h     | 16 ++++++++++++++++
 libavcodec/version.h |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 libavcodec/opt.h

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f05244ed95..784226f7af 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -3,7 +3,7 @@ include $(SUBDIR)../config.mak
 NAME = avcodec
 FFLIBS = avutil
 
-HEADERS = avcodec.h avfft.h dxva2.h vaapi.h vdpau.h version.h xvmc.h
+HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h version.h xvmc.h
 
 OBJS = allcodecs.o                                                      \
        audioconvert.o                                                   \
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
new file mode 100644
index 0000000000..e754bb93d8
--- /dev/null
+++ b/libavcodec/opt.h
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * This header is provided for compatibility only and will be removed
+ * on next major bump
+ */
+
+#ifndef AVCODEC_OPT_H
+#define AVCODEC_OPT_H
+
+#include "libavcodec/version.h"
+
+#if FF_API_OPT_H
+#include "libavutil/opt.h"
+#endif
+
+#endif
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3146f765ee..92f9e58ffa 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -62,5 +62,8 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif
+#ifndef FF_API_OPT_H
+#define FF_API_OPT_H            (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
 
 #endif /* AVCODEC_VERSION_H */
-- 
cgit v1.2.3