summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-04-19 17:18:10 +0200
committerwm4 <wm4@nowhere>2014-04-19 17:18:10 +0200
commit85998f6121edb44672f51c4745fb243f3c567d3f (patch)
tree64ff8dd5ed267b9d8e51330ead013ca7ff141564 /stream
parent0cff5836c3f410136e3fdb3e2f9e24bb81dd9a87 (diff)
downloadmpv-85998f6121edb44672f51c4745fb243f3c567d3f.tar.bz2
mpv-85998f6121edb44672f51c4745fb243f3c567d3f.tar.xz
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.
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_cdda.c1
-rw-r--r--stream/tv.c2
2 files changed, 1 insertions, 2 deletions
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 <string.h>
#include <ctype.h>
#include <sys/time.h>
+#include <libavutil/avstring.h>
#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"