wcap: Rename wcap-encode to just wcap

20 files changed, 3 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index fbc96e64..53eb43c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = shared src clients wcap-decode data protocol tests
+SUBDIRS = shared src clients wcap data protocol tests
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
diff --git a/configure.ac b/configure.ac
index 19bceefc..d65848ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,7 @@ AC_CONFIG_FILES([Makefile
 		 src/Makefile
 		 src/xwayland/Makefile
 		 clients/Makefile
-		 wcap-decode/Makefile
+		 wcap/Makefile
 		 data/Makefile
 		 protocol/Makefile
 		 tests/Makefile])
diff --git a/src/screenshooter.c b/src/screenshooter.c
index e3e8779c..da06ae3a 100644
--- a/src/screenshooter.c
+++ b/src/screenshooter.c
@@ -31,7 +31,7 @@
 #include "compositor.h"
 #include "screenshooter-server-protocol.h"
 
-#include "../wcap-decode/wcap-decode.h"
+#include "../wcap/wcap-decode.h"
 
 struct screenshooter {
 	struct wl_object base;
diff --git a/wcap-decode/COPYING b/wcap/COPYING
index 3d019b10..3d019b10 100644
--- a/wcap-decode/COPYING
+++ b/wcap/COPYING
diff --git a/wcap-decode/EbmlIDs.h b/wcap/EbmlIDs.h
index 3418e365..3418e365 100644
--- a/wcap-decode/EbmlIDs.h
+++ b/wcap/EbmlIDs.h
diff --git a/wcap-decode/EbmlWriter.c b/wcap/EbmlWriter.c
index fbf2c66e..fbf2c66e 100644
--- a/wcap-decode/EbmlWriter.c
+++ b/wcap/EbmlWriter.c
diff --git a/wcap-decode/EbmlWriter.h b/wcap/EbmlWriter.h
index 324c9bca..324c9bca 100644
--- a/wcap-decode/EbmlWriter.h
+++ b/wcap/EbmlWriter.h
diff --git a/wcap-decode/args.c b/wcap/args.c
index 37ba7788..37ba7788 100644
--- a/wcap-decode/args.c
+++ b/wcap/args.c
diff --git a/wcap-decode/args.h b/wcap/args.h
index 7963fa6b..7963fa6b 100644
--- a/wcap-decode/args.h
+++ b/wcap/args.h
diff --git a/wcap-decode/mem_ops.h b/wcap/mem_ops.h
index 0e523681..0e523681 100644
--- a/wcap-decode/mem_ops.h
+++ b/wcap/mem_ops.h
diff --git a/wcap-decode/mem_ops_aligned.h b/wcap/mem_ops_aligned.h
index 0fbba65e..0fbba65e 100644
--- a/wcap-decode/mem_ops_aligned.h
+++ b/wcap/mem_ops_aligned.h
diff --git a/wcap-decode/tools_common.c b/wcap/tools_common.c
index 6f950286..6f950286 100644
--- a/wcap-decode/tools_common.c
+++ b/wcap/tools_common.c
diff --git a/wcap-decode/tools_common.h b/wcap/tools_common.h
index 80c97473..80c97473 100644
--- a/wcap-decode/tools_common.h
+++ b/wcap/tools_common.h
diff --git a/wcap-decode/vpx_config.h b/wcap/vpx_config.h
index b4e8c307..b4e8c307 100644
--- a/wcap-decode/vpx_config.h
+++ b/wcap/vpx_config.h
diff --git a/wcap-decode/vpx_timer.h b/wcap/vpx_timer.h
index d07e0861..d07e0861 100644
--- a/wcap-decode/vpx_timer.h
+++ b/wcap/vpx_timer.h
diff --git a/wcap-decode/vpxenc.c b/wcap/vpxenc.c
index 3559a326..3559a326 100644
--- a/wcap-decode/vpxenc.c
+++ b/wcap/vpxenc.c
diff --git a/wcap-decode/wcap-decode.c b/wcap/wcap-decode.c
index f6798c62..f6798c62 100644
--- a/wcap-decode/wcap-decode.c
+++ b/wcap/wcap-decode.c
diff --git a/wcap-decode/wcap-decode.h b/wcap/wcap-decode.h
index 598e490c..598e490c 100644
--- a/wcap-decode/wcap-decode.h
+++ b/wcap/wcap-decode.h
diff --git a/wcap-decode/y4minput.c b/wcap/y4minput.c
index dd51421d..dd51421d 100644
--- a/wcap-decode/y4minput.c
+++ b/wcap/y4minput.c
diff --git a/wcap-decode/y4minput.h b/wcap/y4minput.h
index 1a01bcda..1a01bcda 100644
--- a/wcap-decode/y4minput.h
+++ b/wcap/y4minput.h