summaryrefslogtreecommitdiffstats
path: root/audio/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:39:45 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:39:45 +0100
commit0112143fdaae0a6264d9e02355e9dc0ca4f7741c (patch)
treebbbe9527d1e1490e37b67d97398c5bc19c7794cd /audio/decode
parent73a5417950a2d21a397597c05521725f3d125993 (diff)
downloadmpv-0112143fdaae0a6264d9e02355e9dc0ca4f7741c.tar.bz2
mpv-0112143fdaae0a6264d9e02355e9dc0ca4f7741c.tar.xz
Split mpvcore/ into common/, misc/, bstr/
Diffstat (limited to 'audio/decode')
-rw-r--r--audio/decode/ad.h2
-rw-r--r--audio/decode/ad_lavc.c8
-rw-r--r--audio/decode/ad_mpg123.c2
-rw-r--r--audio/decode/ad_spdif.c4
-rw-r--r--audio/decode/dec_audio.c6
5 files changed, 11 insertions, 11 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h
index 56f8944120..2ac9fb21f6 100644
--- a/audio/decode/ad.h
+++ b/audio/decode/ad.h
@@ -19,7 +19,7 @@
#ifndef MPLAYER_AD_H
#define MPLAYER_AD_H
-#include "mpvcore/codecs.h"
+#include "common/codecs.h"
#include "demux/stheader.h"
#include "demux/demux.h"
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 8b2c2d1727..9e1ba49fc1 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -29,11 +29,11 @@
#include "talloc.h"
#include "config.h"
-#include "mpvcore/av_common.h"
-#include "mpvcore/codecs.h"
-#include "mpvcore/mp_msg.h"
+#include "common/av_common.h"
+#include "common/codecs.h"
+#include "common/msg.h"
#include "options/options.h"
-#include "mpvcore/av_opts.h"
+#include "common/av_opts.h"
#include "ad.h"
#include "audio/fmt-conversion.h"
diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c
index f65553bd77..57f84e136f 100644
--- a/audio/decode/ad_mpg123.c
+++ b/audio/decode/ad_mpg123.c
@@ -25,7 +25,7 @@
#include "config.h"
#include "ad.h"
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
#include <mpg123.h>
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index fdc12772b8..5532d6b5a8 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -26,8 +26,8 @@
#include <libavutil/opt.h>
#include "config.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/av_common.h"
+#include "common/msg.h"
+#include "common/av_common.h"
#include "options/options.h"
#include "ad.h"
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index 1c34c6abe9..51966a7cc6 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -26,9 +26,9 @@
#include "demux/codec_tags.h"
#include "config.h"
-#include "mpvcore/codecs.h"
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/bstr.h"
+#include "common/codecs.h"
+#include "common/msg.h"
+#include "bstr/bstr.h"
#include "stream/stream.h"
#include "demux/demux.h"