More libavcodec v53 changes required.

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 8cab4e6852ffa3063e0a7a0b1f36c49a131a7630..986050c3b9bda5a63546ec1dcf743190c88ded97 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -40,7 +40,6 @@
 #ifdef SWSCALE
 #include <libswscale/swscale.h>
 #endif
-#include <libavcodec/opt.h>
 #if LIBAVUTIL_VERSION_INT >= ((50<<16)+(8<<8)+0)
 #include <libavutil/pixdesc.h>
 #endif
@@ -51,9 +50,12 @@
 #endif
 
 #if LIBAVCODEC_VERSION_MAJOR > 52
+#include <libavutil/opt.h>
 #define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
 #define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
 #define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+#else
+#include <libavcodec/opt.h>
 #endif
 
 #define MAX_AUDIO_STREAMS (8)

diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 1bd3b1c0662f8872e7249615c878c04f708d6141..030fe3da435566eaf56452bf174160813194c1d0 100644 (file)
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -34,10 +34,14 @@ extern mlt_producer producer_avformat_init( mlt_profile profile, const char *ser
 
 // ffmpeg Header files
 #include <libavformat/avformat.h>
-#include <libavcodec/opt.h>
 #ifdef AVDEVICE
 #include <libavdevice/avdevice.h>
 #endif
+#if LIBAVCODEC_VERSION_MAJOR > 52
+#include <libavutil/opt.h>
+#else
+#include <libavcodec/opt.h>
+#endif
 
 // A static flag used to determine if avformat has been initialised
 static int avformat_initialised = 0;

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 8d43c76a7a0d388df4566e68e3e5d5adee166050..ee975fa5bc318be9b0f7b0986c30fc323d3776f0 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -31,7 +31,6 @@
 
 // ffmpeg Header files
 #include <libavformat/avformat.h>
-#include <libavcodec/opt.h>
 #ifdef SWSCALE
 #  include <libswscale/swscale.h>
 #endif
@@ -57,9 +56,12 @@
 #endif
 
 #if LIBAVCODEC_VERSION_MAJOR > 52
+#include <libavutil/opt.h>
 #define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
 #define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
 #define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+#else
+#include <libavcodec/opt.h>
 #endif
 
 #define POSITION_INITIAL (-2)