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.
---
 stream/cache2.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'stream')

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__)
-- 
cgit v1.2.3