From 68ff8a0484b592a629ef2bbcb0537265ae36d1d0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 29 Aug 2014 12:09:04 +0200 Subject: 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. --- options/m_config.h | 2 +- options/m_option.h | 2 +- options/path.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'options') diff --git a/options/m_config.h b/options/m_config.h index 958dc3d5e4..eb255428e0 100644 --- a/options/m_config.h +++ b/options/m_config.h @@ -22,7 +22,7 @@ #include #include -#include "bstr/bstr.h" +#include "misc/bstr.h" // m_config provides an API to manipulate the config variables in MPlayer. // It makes use of the Options API to provide a context stack that diff --git a/options/m_option.h b/options/m_option.h index 13afea22df..d0ca211aa1 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -23,7 +23,7 @@ #include #include -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "audio/chmap.h" // m_option allows to parse, print and copy data of various types. diff --git a/options/path.h b/options/path.h index 30ca34d205..6e64cd1d3c 100644 --- a/options/path.h +++ b/options/path.h @@ -22,7 +22,7 @@ #define MPLAYER_PATH_H #include -#include "bstr/bstr.h" +#include "misc/bstr.h" struct mpv_global; -- cgit v1.2.3