diff options
Diffstat (limited to 'audio/decode')
-rw-r--r-- | audio/decode/ad.c | 4 | ||||
-rw-r--r-- | audio/decode/ad.h | 4 | ||||
-rw-r--r-- | audio/decode/ad_dvdpcm.c | 2 | ||||
-rw-r--r-- | audio/decode/ad_internal.h | 8 | ||||
-rw-r--r-- | audio/decode/ad_lavc.c | 8 | ||||
-rw-r--r-- | audio/decode/ad_pcm.c | 4 | ||||
-rw-r--r-- | audio/decode/ad_spdif.c | 2 | ||||
-rw-r--r-- | audio/decode/dec_audio.c | 14 | ||||
-rw-r--r-- | audio/decode/dec_audio.h | 2 |
9 files changed, 24 insertions, 24 deletions
diff --git a/audio/decode/ad.c b/audio/decode/ad.c index 93cebed86d..ac344636e6 100644 --- a/audio/decode/ad.c +++ b/audio/decode/ad.c @@ -25,8 +25,8 @@ #include "config.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "libmpdemux/stheader.h" +#include "demux/demux.h" +#include "demux/stheader.h" #include "ad.h" /* Missed vorbis, mad, dshow */ diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 5396085d04..2de0e0641a 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -19,8 +19,8 @@ #ifndef MPLAYER_AD_H #define MPLAYER_AD_H -#include "mpc_info.h" -#include "libmpdemux/stheader.h" +#include "core/mpc_info.h" +#include "demux/stheader.h" typedef struct mp_codec_info ad_info_t; diff --git a/audio/decode/ad_dvdpcm.c b/audio/decode/ad_dvdpcm.c index 41f6a1426d..3b12c71c12 100644 --- a/audio/decode/ad_dvdpcm.c +++ b/audio/decode/ad_dvdpcm.c @@ -21,7 +21,7 @@ #include <unistd.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "ad_internal.h" static const ad_info_t info = diff --git a/audio/decode/ad_internal.h b/audio/decode/ad_internal.h index 4cffc95126..1fed350b98 100644 --- a/audio/decode/ad_internal.h +++ b/audio/decode/ad_internal.h @@ -19,12 +19,12 @@ #ifndef MPLAYER_AD_INTERNAL_H #define MPLAYER_AD_INTERNAL_H -#include "codec-cfg.h" -#include "libaf/format.h" +#include "core/codec-cfg.h" +#include "audio/format.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "libmpdemux/stheader.h" +#include "demux/demux.h" +#include "demux/stheader.h" #include "ad.h" diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 2eacfadb8f..2342a6985f 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -28,13 +28,13 @@ #include "talloc.h" #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" #include "ad_internal.h" -#include "libaf/reorder_ch.h" +#include "audio/reorder_ch.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" static const ad_info_t info = { diff --git a/audio/decode/ad_pcm.c b/audio/decode/ad_pcm.c index c265dfcd56..01500b1274 100644 --- a/audio/decode/ad_pcm.c +++ b/audio/decode/ad_pcm.c @@ -26,8 +26,8 @@ #include "talloc.h" #include "config.h" #include "ad_internal.h" -#include "libaf/format.h" -#include "libaf/reorder_ch.h" +#include "audio/format.h" +#include "audio/reorder_ch.h" static const ad_info_t info = { "Uncompressed PCM audio decoder", diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index 877bc99317..c22280cbf0 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -23,7 +23,7 @@ #include <libavutil/opt.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "ad_internal.h" static const ad_info_t info = { diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index 2602352e52..1444d39009 100644 --- a/audio/decode/dec_audio.c +++ b/audio/decode/dec_audio.c @@ -22,20 +22,20 @@ #include <assert.h> #include "config.h" -#include "mp_msg.h" -#include "bstr.h" +#include "core/mp_msg.h" +#include "core/bstr.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" +#include "demux/demux.h" -#include "codec-cfg.h" -#include "libmpdemux/stheader.h" +#include "core/codec-cfg.h" +#include "demux/stheader.h" #include "dec_audio.h" #include "ad.h" -#include "libaf/format.h" +#include "audio/format.h" -#include "libaf/af.h" +#include "audio/filter/af.h" int fakemono = 0; diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h index 0d4baf0666..986b85f22a 100644 --- a/audio/decode/dec_audio.h +++ b/audio/decode/dec_audio.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_DEC_AUDIO_H #define MPLAYER_DEC_AUDIO_H -#include "libmpdemux/stheader.h" +#include "demux/stheader.h" struct bstr; |