From 85998f6121edb44672f51c4745fb243f3c567d3f Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 19 Apr 2014 17:18:10 +0200 Subject: Fix some libav* include statements Fix all include statements of the form: #include "libav.../..." These come from MPlayer times, when FFmpeg was somehow part of the MPlayer build tree, and this form was needed to prefer the local files over system FFmpeg. In some cases, the include statement wasn't needed or could be replaced with mpv defined symbols. --- stream/stream_cdda.c | 1 - stream/tv.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'stream') diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index bc9576cd62..1b81bfc6fb 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -43,7 +43,6 @@ #include "stream.h" #include "options/m_option.h" -#include "libavutil/common.h" #include "compat/mpbswap.h" #include "common/msg.h" diff --git a/stream/tv.c b/stream/tv.c index 80e6c5e990..aa7367f276 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "config.h" @@ -43,7 +44,6 @@ #include "audio/format.h" #include "video/img_fourcc.h" -#include "libavutil/avstring.h" #include "osdep/timer.h" #include "tv.h" -- cgit v1.2.3