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 /demux/demux_lavf.c | |
| 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 'demux/demux_lavf.c')
| -rw-r--r-- | demux/demux_lavf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 79565993a4..988c3da4e4 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -39,13 +39,12 @@ # include <libavutil/display.h> #endif #include <libavutil/opt.h> -#include "compat/libav.h" #include "options/options.h" #include "common/msg.h" #include "common/tags.h" #include "common/av_common.h" -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "stream/stream.h" #include "demux.h" |