diff options
| author | wm4 <wm4@nowhere> | 2014-08-29 12:09:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-08-29 12:31:52 +0200 |
| commit | 68ff8a0484b592a629ef2bbcb0537265ae36d1d0 (patch) | |
| tree | 9dafc6d3e5bea87957134ddbca426abb4a4c6117 /audio/decode | |
| parent | 4bc9c52a122ba51c8fd8f2aea923f8cb2bab1d5f (diff) | |
| download | mpv-68ff8a0484b592a629ef2bbcb0537265ae36d1d0.tar.bz2 mpv-68ff8a0484b592a629ef2bbcb0537265ae36d1d0.tar.xz | |
Move compat/ and bstr/ directory contents somewhere else
bstr.c doesn't really deserve its own directory, and compat had just
a few files, most of which may as well be in osdep. There isn't really
any justification for these extra directories, so get rid of them.
The compat/libav.h was empty - just delete it. We changed our approach
to API compatibility, and will likely not need it anymore.
Diffstat (limited to 'audio/decode')
| -rw-r--r-- | audio/decode/ad_lavc.c | 2 | ||||
| -rw-r--r-- | audio/decode/dec_audio.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index c4372ba4b3..afff84ef00 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -37,8 +37,6 @@ #include "ad.h" #include "audio/fmt-conversion.h" -#include "compat/libav.h" - struct priv { AVCodecContext *avctx; AVFrame *avframe; diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index c7580a23d8..0afcd8857e 100644 --- a/audio/decode/dec_audio.c +++ b/audio/decode/dec_audio.c @@ -28,7 +28,7 @@ #include "config.h" #include "common/codecs.h" #include "common/msg.h" -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "stream/stream.h" #include "demux/demux.h" |