summaryrefslogtreecommitdiffstats
path: root/video/decode/vd_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-29 12:09:04 +0200
committerwm4 <wm4@nowhere>2014-08-29 12:31:52 +0200
commit68ff8a0484b592a629ef2bbcb0537265ae36d1d0 (patch)
tree9dafc6d3e5bea87957134ddbca426abb4a4c6117 /video/decode/vd_lavc.c
parent4bc9c52a122ba51c8fd8f2aea923f8cb2bab1d5f (diff)
downloadmpv-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 'video/decode/vd_lavc.c')
-rw-r--r--video/decode/vd_lavc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 350f5f16b2..1d33742bc5 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -28,17 +28,15 @@
#include <libavutil/intreadwrite.h>
#include <libavutil/pixdesc.h>
-#include "compat/libav.h"
-
#include "talloc.h"
#include "config.h"
#include "common/msg.h"
#include "options/options.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
#include "common/av_common.h"
#include "common/codecs.h"
-#include "compat/mpbswap.h"
+#include "osdep/mpbswap.h"
#include "video/fmt-conversion.h"
#include "vd.h"