From 009d9d8706f45bc7cb618891527967e70ed17a8d Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Wed, 15 Aug 2012 23:23:02 +0300
Subject: Adjust ffmpeg/libav #includes to work with recent upstream changes

The <libavutil/avutil.h> stopped including <libavutil/common.h>
recursively in recent ffmpeg/libav git revisions. As a result, some
files no longer got needed definitions, causing a build failure.
Modify #include lines in various files to fix build with the latest
versions of ffmpeg/libav headers.
---
 bstr.c                   | 3 ++-
 libaf/af_lavcac3enc.c    | 1 +
 libao2/ao_portaudio.c    | 2 +-
 libmpcodecs/vf.c         | 3 ++-
 libmpcodecs/vf_expand.c  | 3 ++-
 libmpcodecs/vf_geq.c     | 6 +++---
 libmpcodecs/vf_gradfun.c | 3 ++-
 libmpcodecs/vf_qp.c      | 1 +
 libmpcodecs/vf_sab.c     | 6 ++++--
 libmpcodecs/vf_uspp.c    | 5 +++--
 libvo/vo_gl3.c           | 2 +-
 stream/cache2.c          | 7 ++++---
 sub/spudec.c             | 2 +-
 13 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/bstr.c b/bstr.c
index 036cf69d42..d3247ce1d6 100644
--- a/bstr.c
+++ b/bstr.c
@@ -17,11 +17,12 @@
  */
 
 #include <string.h>
-#include <libavutil/avutil.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 
+#include <libavutil/common.h>
+
 #include "talloc.h"
 
 #include "bstr.h"
diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c
index 251ccf13b7..ca0fd39a4e 100644
--- a/libaf/af_lavcac3enc.c
+++ b/libaf/af_lavcac3enc.c
@@ -28,6 +28,7 @@
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/intreadwrite.h>
+#include <libavutil/mem.h>
 
 #include "config.h"
 #include "af.h"
diff --git a/libao2/ao_portaudio.c b/libao2/ao_portaudio.c
index c8275f0b38..9fa1cdbbeb 100644
--- a/libao2/ao_portaudio.c
+++ b/libao2/ao_portaudio.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <pthread.h>
 
-#include <libavutil/avutil.h>
+#include <libavutil/common.h>
 #include <portaudio.h>
 
 #include "config.h"
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index a31ec9e734..8017b6b510 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <assert.h>
 #include <sys/types.h>
+#include <libavutil/common.h>
+#include <libavutil/mem.h>
 
 #include "config.h"
 
@@ -34,7 +36,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "libavutil/mem.h"
 
 extern const vf_info_t vf_info_vo;
 extern const vf_info_t vf_info_rectangle;
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index 0ff40d4652..b8ac9f728d 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include <libavutil/common.h>
+
 #include "config.h"
 #include "mp_msg.h"
 #include "options.h"
@@ -30,7 +32,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "libavutil/avutil.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c
index 68a9cf780c..5c2e6c32c7 100644
--- a/libmpcodecs/vf_geq.c
+++ b/libmpcodecs/vf_geq.c
@@ -24,6 +24,9 @@
 #include <math.h>
 #include <inttypes.h>
 
+#include <libavutil/eval.h>
+#include <libavutil/common.h>
+
 #include "config.h"
 
 #include "mp_msg.h"
@@ -33,9 +36,6 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "libavcodec/avcodec.h"
-#include "libavutil/eval.h"
-
 struct vf_priv_s {
     AVExpr * e[3];
     int framenum;
diff --git a/libmpcodecs/vf_gradfun.c b/libmpcodecs/vf_gradfun.c
index c74fbfe5fb..eb73cfa2a4 100644
--- a/libmpcodecs/vf_gradfun.c
+++ b/libmpcodecs/vf_gradfun.c
@@ -33,13 +33,14 @@
 #include <inttypes.h>
 #include <math.h>
 
+#include <libavutil/common.h>
+
 #include "config.h"
 #include "cpudetect.h"
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
-#include "libavutil/avutil.h"
 #include "ffmpeg_files/x86_cpu.h"
 
 #include "m_option.h"
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c
index 5e418d2814..64e62723d8 100644
--- a/libmpcodecs/vf_qp.c
+++ b/libmpcodecs/vf_qp.c
@@ -25,6 +25,7 @@
 #include <inttypes.h>
 
 #include <libavutil/eval.h>
+#include <libavutil/mem.h>
 
 #include "mp_msg.h"
 #include "cpudetect.h"
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c
index 1a4d87c338..649c3ccc43 100644
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@@ -24,14 +24,16 @@
 #include <inttypes.h>
 #include <assert.h>
 
+#include <libavutil/mem.h>
+#include <libavutil/common.h>
+#include <libswscale/swscale.h>
+
 #include "config.h"
 #include "mp_msg.h"
 
-#include "libavutil/avutil.h"
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libswscale/swscale.h"
 #include "vf_scale.h"
 
 
diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c
index 91c0e61847..8f6dfd25ee 100644
--- a/libmpcodecs/vf_uspp.c
+++ b/libmpcodecs/vf_uspp.c
@@ -25,13 +25,14 @@
 #include <math.h>
 #include <assert.h>
 
+#include <libavcodec/avcodec.h>
+#include <libavutil/mem.h>
+
 #include "config.h"
 
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#include "libavcodec/avcodec.h"
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c
index 496e22bfcb..dea0c6637a 100644
--- a/libvo/vo_gl3.c
+++ b/libvo/vo_gl3.c
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include "config.h"
 
-#include <libavutil/avutil.h>
+#include <libavutil/common.h>
 
 #ifdef CONFIG_LCMS2
 #include <lcms2.h>
diff --git a/stream/cache2.c b/stream/cache2.c
index 69ed82dd27..77c74d3b19 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -16,8 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
 // Initial draft of my new cache system...
 // Note it runs in 2 processes (using fork()), but doesn't require locking!!
 // TODO: seeking, data consistency checking
@@ -39,7 +37,10 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libavutil/avutil.h"
+#include <libavutil/common.h>
+
+#include "config.h"
+
 #include "osdep/shmem.h"
 #include "osdep/timer.h"
 #if defined(__MINGW32__)
diff --git a/sub/spudec.c b/sub/spudec.c
index 47a3dec22a..47e1676e2e 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <math.h>
 
-#include <libavutil/avutil.h>
+#include <libavutil/common.h>
 #include <libavutil/intreadwrite.h>
 #include <libswscale/swscale.h>
 
-- 
cgit v1.2.3