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 /stream | |
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 'stream')
-rw-r--r-- | stream/cache2.c | 7 |
1 files changed, 4 insertions, 3 deletions
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__) |