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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f05244e..784226f 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 0000000..e754bb9
--- /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 70e0712..9622184 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -53,5 +53,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 */
-- 
1.7.4.1

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to