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.
---
 libmpcodecs/vf_geq.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libmpcodecs/vf_geq.c')

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