diff options
author | Uoti Urpala <uau@mplayer2.org> | 2012-08-15 23:23:02 +0300 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-21 18:22:00 +0200 |
commit | 009d9d8706f45bc7cb618891527967e70ed17a8d (patch) | |
tree | 6b29dffc19d2c6a6d881e3ec89b4a44e67c58fff /libmpcodecs | |
parent | a1380f394597e06e04195b1812300550f3c2df40 (diff) | |
download | mpv-009d9d8706f45bc7cb618891527967e70ed17a8d.tar.bz2 mpv-009d9d8706f45bc7cb618891527967e70ed17a8d.tar.xz |
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.
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_expand.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_geq.c | 6 | ||||
-rw-r--r-- | libmpcodecs/vf_gradfun.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_qp.c | 1 | ||||
-rw-r--r-- | libmpcodecs/vf_sab.c | 6 | ||||
-rw-r--r-- | libmpcodecs/vf_uspp.c | 5 |
7 files changed, 17 insertions, 10 deletions
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" |