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 /stream | |
| 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 'stream')
| -rw-r--r-- | stream/stream.c | 4 | ||||
| -rw-r--r-- | stream/stream.h | 2 | ||||
| -rw-r--r-- | stream/stream_cdda.c | 2 | ||||
| -rw-r--r-- | stream/stream_lavf.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/stream/stream.c b/stream/stream.c index e9bbbc8412..78859bc44f 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -31,7 +31,7 @@ #include <assert.h> #include <libavutil/common.h> -#include "compat/mpbswap.h" +#include "osdep/mpbswap.h" #include "talloc.h" @@ -39,7 +39,7 @@ #include "common/common.h" #include "common/global.h" -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "common/msg.h" #include "options/options.h" #include "options/path.h" diff --git a/stream/stream.h b/stream/stream.h index 2cd3d9f5fa..a961267aac 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -27,7 +27,7 @@ #include <sys/types.h> #include <fcntl.h> -#include "bstr/bstr.h" +#include "misc/bstr.h" enum streamtype { STREAMTYPE_GENERIC = 0, diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 1a03c443df..79f700c260 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -46,7 +46,7 @@ #include "options/m_option.h" #include "options/m_config.h" #include "options/options.h" -#include "compat/mpbswap.h" +#include "osdep/mpbswap.h" #include "common/msg.h" diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index afb92f279f..37c6adc51c 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -31,7 +31,7 @@ #include "cookies.h" -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "talloc.h" struct stream_lavf_params *stream_lavf_opts; |