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 /input | |
| parent | 4bc9c52a122ba51c8fd8f2aea923f8cb2bab1d5f (diff) | |
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 'input')
| -rw-r--r-- | input/cmd_parse.c | 2 | ||||
| -rw-r--r-- | input/event.h | 2 | ||||
| -rw-r--r-- | input/input.c | 2 | ||||
| -rw-r--r-- | input/input.h | 2 | ||||
| -rw-r--r-- | input/keycodes.c | 2 | ||||
| -rw-r--r-- | input/pipe.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/input/cmd_parse.c b/input/cmd_parse.c index db44ccaf5e..05cd066dbf 100644 --- a/input/cmd_parse.c +++ b/input/cmd_parse.c @@ -18,7 +18,7 @@ #include <stddef.h> -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "common/common.h" #include "common/msg.h" #include "options/m_option.h" diff --git a/input/event.h b/input/event.h index 820932d9da..a1cb542f8f 100644 --- a/input/event.h +++ b/input/event.h @@ -15,7 +15,7 @@ * with mpv. If not, see <http://www.gnu.org/licenses/>. */ -#include "bstr/bstr.h" +#include "misc/bstr.h" struct input_ctx; diff --git a/input/input.c b/input/input.c index e85d16ccd2..908d50d014 100644 --- a/input/input.c +++ b/input/input.c @@ -48,7 +48,7 @@ #include "options/path.h" #include "talloc.h" #include "options/options.h" -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "stream/stream.h" #include "common/common.h" diff --git a/input/input.h b/input/input.h index a8341d7773..431519a47c 100644 --- a/input/input.h +++ b/input/input.h @@ -20,7 +20,7 @@ #define MPLAYER_INPUT_H #include <stdbool.h> -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "cmd_list.h" #include "cmd_parse.h" diff --git a/input/keycodes.c b/input/keycodes.c index 00f983e140..a92b6ed0c8 100644 --- a/input/keycodes.c +++ b/input/keycodes.c @@ -20,7 +20,7 @@ #include <string.h> #include <strings.h> -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "common/common.h" #include "common/msg.h" diff --git a/input/pipe.c b/input/pipe.c index 59f6a64c2b..12922f590c 100644 --- a/input/pipe.c +++ b/input/pipe.c @@ -10,7 +10,7 @@ #endif #include "common/msg.h" -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "osdep/io.h" #include "input.h" #include "cmd_parse.h" |