OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'qatar/master'
[coroid/ffmpeg_saccubus.git]
/
libavfilter
/
Makefile
diff --git
a/libavfilter/Makefile
b/libavfilter/Makefile
index
d2e59f9
..
3755630
100644
(file)
--- a/
libavfilter/Makefile
+++ b/
libavfilter/Makefile
@@
-137,8
+137,8
@@
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
--include $(SUBDIR)$(ARCH)/Makefile
+-include $(S
RC_PATH)/$(S
UBDIR)$(ARCH)/Makefile
DIRS = x86 libmpcodecs
-include $(S
UBDIR)..
/subdir.mak
+include $(S
RC_PATH)
/subdir.mak