lavc: provide the opt.h header until the next bump
authorAnton Khirnov <anton@khirnov.net>
Wed, 20 Apr 2011 15:09:45 +0000 (17:09 +0200)
committerAnton Khirnov <anton@khirnov.net>
Thu, 21 Apr 2011 05:14:51 +0000 (07:14 +0200)
AVOptions were moved to libavutil only recently.

libavcodec/Makefile
libavcodec/opt.h [new file with mode: 0644]
libavcodec/version.h

index f05244e..784226f 100644 (file)
@@ -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 (file)
index 0000000..e754bb9
--- /dev/null
@@ -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
index 3146f76..92f9e58 100644 (file)
@@ -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 */