28 files changed, 21 insertions, 22 deletions
diff --git a/mediaplugin/src/plugins/media/Makefile b/mediaplugin/src/mediaplugins/Makefile
index 2de6a1f9..2de6a1f9 100644
--- a/mediaplugin/src/plugins/media/Makefile
+++ b/mediaplugin/src/mediaplugins/Makefile
diff --git a/mediaplugin/src/plugins/media/autogen.sh b/mediaplugin/src/mediaplugins/autogen.sh
index c2c72f82..c2c72f82 100755
--- a/mediaplugin/src/plugins/media/autogen.sh
+++ b/mediaplugin/src/mediaplugins/autogen.sh
diff --git a/mediaplugin/src/plugins/media/core/logger.cpp b/mediaplugin/src/mediaplugins/core/logger.cpp
index fbdeb6a1..fbdeb6a1 100644
--- a/mediaplugin/src/plugins/media/core/logger.cpp
+++ b/mediaplugin/src/mediaplugins/core/logger.cpp
diff --git a/mediaplugin/src/plugins/media/core/plugin_core.cpp b/mediaplugin/src/mediaplugins/core/plugin_core.cpp
index 751b93fa..751b93fa 100644
--- a/mediaplugin/src/plugins/media/core/plugin_core.cpp
+++ b/mediaplugin/src/mediaplugins/core/plugin_core.cpp
diff --git a/mediaplugin/src/plugins/media/core/util.cpp b/mediaplugin/src/mediaplugins/core/util.cpp
index 02487521..02487521 100644
--- a/mediaplugin/src/plugins/media/core/util.cpp
+++ b/mediaplugin/src/mediaplugins/core/util.cpp
diff --git a/mediaplugin/src/plugins/media/ffmpeg/Makefile.am b/mediaplugin/src/mediaplugins/ffmpeg/Makefile.am
index 8dec1d59..8dec1d59 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/Makefile.am
+++ b/mediaplugin/src/mediaplugins/ffmpeg/Makefile.am
diff --git a/mediaplugin/src/plugins/media/ffmpeg/Makefile.in b/mediaplugin/src/mediaplugins/ffmpeg/Makefile.in
index 94c83aa7..f088a4b1 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/Makefile.in
+++ b/mediaplugin/src/mediaplugins/ffmpeg/Makefile.in
@@ -37,22 +37,21 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = .
 DIST_COMMON = $(am__configure_deps) \
-	$(srcdir)/../../../../dists/autogen/config.guess \
-	$(srcdir)/../../../../dists/autogen/config.sub \
-	$(srcdir)/../../../../dists/autogen/depcomp \
-	$(srcdir)/../../../../dists/autogen/install-sh \
-	$(srcdir)/../../../../dists/autogen/ltmain.sh \
-	$(srcdir)/../../../../dists/autogen/missing \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/configure ../../../../dists/autogen/config.guess \
-	../../../../dists/autogen/config.sub \
-	../../../../dists/autogen/depcomp \
-	../../../../dists/autogen/install-sh \
-	../../../../dists/autogen/ltmain.sh \
-	../../../../dists/autogen/missing compile
+	$(srcdir)/../../../dists/autogen/config.guess \
+	$(srcdir)/../../../dists/autogen/config.sub \
+	$(srcdir)/../../../dists/autogen/depcomp \
+	$(srcdir)/../../../dists/autogen/install-sh \
+	$(srcdir)/../../../dists/autogen/ltmain.sh \
+	$(srcdir)/../../../dists/autogen/missing $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/configure \
+	../../../dists/autogen/config.guess \
+	../../../dists/autogen/config.sub \
+	../../../dists/autogen/depcomp \
+	../../../dists/autogen/install-sh \
+	../../../dists/autogen/ltmain.sh \
+	../../../dists/autogen/missing compile
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/../../../../dists/autogen/m4/pkg.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../../../dists/autogen/m4/pkg.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -98,7 +97,7 @@ libffmpegplugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(libffmpegplugin_la_CXXFLAGS) $(CXXFLAGS) \
 	$(libffmpegplugin_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/../../../../dists/autogen/depcomp
+depcomp = $(SHELL) $(top_srcdir)/../../../dists/autogen/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
diff --git a/mediaplugin/src/plugins/media/ffmpeg/autogen.sh b/mediaplugin/src/mediaplugins/ffmpeg/autogen.sh
index d9dc50ec..e181aa61 100755
--- a/mediaplugin/src/plugins/media/ffmpeg/autogen.sh
+++ b/mediaplugin/src/mediaplugins/ffmpeg/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-AUTOGEN_DIR=../../../../dists/autogen
+AUTOGEN_DIR=../../../dists/autogen
 libtoolize --force --copy
 aclocal -I ${AUTOGEN_DIR}/m4 && autoconf
 automake -a
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure b/mediaplugin/src/mediaplugins/ffmpeg/configure
index 091fe80b..16b972df 100755
--- a/mediaplugin/src/plugins/media/ffmpeg/configure
+++ b/mediaplugin/src/mediaplugins/ffmpeg/configure
@@ -2466,7 +2466,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Set the path to install-sh
 ac_aux_dir=
-for ac_dir in ../../../../dists/autogen "$srcdir"/../../../../dists/autogen; do
+for ac_dir in ../../../dists/autogen "$srcdir"/../../../dists/autogen; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2482,7 +2482,7 @@ for ac_dir in ../../../../dists/autogen "$srcdir"/../../../../dists/autogen; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../../../dists/autogen \"$srcdir\"/../../../../dists/autogen" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../../dists/autogen \"$srcdir\"/../../../dists/autogen" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -15004,7 +15004,7 @@ case "${target_os}" in
 esac
 
 
-PLUGIN_DIR="../../../../game/plugins/media"
+PLUGIN_DIR="../../../game/mediaplugins"
 
 
 # -----------------------------------------
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure.ac b/mediaplugin/src/mediaplugins/ffmpeg/configure.ac
index 99ee770f..f8bfd5b1 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/configure.ac
+++ b/mediaplugin/src/mediaplugins/ffmpeg/configure.ac
@@ -16,7 +16,7 @@ AC_INIT([usdx-ffmpeg-plugin], [1.1])
 AC_CONFIG_SRCDIR(.)
 
 # Set the path to install-sh
-AC_CONFIG_AUX_DIR(../../../../dists/autogen)
+AC_CONFIG_AUX_DIR(../../../dists/autogen)
 
 # show features and packages in one list
 AC_PRESERVE_HELP_ORDER
@@ -76,7 +76,7 @@ case "${target_os}" in
 esac
 AC_SUBST(LIB_EXT)
 
-PLUGIN_DIR="../../../../game/plugins/media"
+PLUGIN_DIR="../../../game/mediaplugins"
 AC_SUBST(PLUGIN_DIR)
 
 # -----------------------------------------
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_convert.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.cpp
index ccbc5400..ccbc5400 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_convert.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.cpp
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_convert.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.h
index ee4c5a81..ee4c5a81 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_convert.h
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.h
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_decode.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp
index da49891c..da49891c 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_decode.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_decode.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.h
index c0d1b288..c0d1b288 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_audio_decode.h
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.h
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
index 13aae4a6..13aae4a6 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.h
index 524e37b4..524e37b4 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.h
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_plugin.cpp
index 01f98595..01f98595 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_plugin.cpp
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_plugin.h
index 7263bada..7263bada 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.h
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_plugin.h
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_video_decode.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp
index b3fc77b3..b3fc77b3 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_video_decode.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp
diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_video_decode.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.h
index 9b0df889..9b0df889 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_video_decode.h
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.h
diff --git a/mediaplugin/src/plugins/media/include/core/begin_pack.h b/mediaplugin/src/mediaplugins/include/core/begin_pack.h
index 504f2f75..504f2f75 100644
--- a/mediaplugin/src/plugins/media/include/core/begin_pack.h
+++ b/mediaplugin/src/mediaplugins/include/core/begin_pack.h
diff --git a/mediaplugin/src/plugins/media/include/core/end_pack.h b/mediaplugin/src/mediaplugins/include/core/end_pack.h
index f6ee748b..f6ee748b 100644
--- a/mediaplugin/src/plugins/media/include/core/end_pack.h
+++ b/mediaplugin/src/mediaplugins/include/core/end_pack.h
diff --git a/mediaplugin/src/plugins/media/include/core/logger.h b/mediaplugin/src/mediaplugins/include/core/logger.h
index c9924b83..c9924b83 100644
--- a/mediaplugin/src/plugins/media/include/core/logger.h
+++ b/mediaplugin/src/mediaplugins/include/core/logger.h
diff --git a/mediaplugin/src/plugins/media/include/core/plugin_audio_convert.h b/mediaplugin/src/mediaplugins/include/core/plugin_audio_convert.h
index e3a31b26..e3a31b26 100644
--- a/mediaplugin/src/plugins/media/include/core/plugin_audio_convert.h
+++ b/mediaplugin/src/mediaplugins/include/core/plugin_audio_convert.h
diff --git a/mediaplugin/src/plugins/media/include/core/plugin_audio_decode.h b/mediaplugin/src/mediaplugins/include/core/plugin_audio_decode.h
index 2385f77c..2385f77c 100644
--- a/mediaplugin/src/plugins/media/include/core/plugin_audio_decode.h
+++ b/mediaplugin/src/mediaplugins/include/core/plugin_audio_decode.h
diff --git a/mediaplugin/src/plugins/media/include/core/plugin_core.h b/mediaplugin/src/mediaplugins/include/core/plugin_core.h
index 67eca5f7..67eca5f7 100644
--- a/mediaplugin/src/plugins/media/include/core/plugin_core.h
+++ b/mediaplugin/src/mediaplugins/include/core/plugin_core.h
diff --git a/mediaplugin/src/plugins/media/include/core/plugin_video_decode.h b/mediaplugin/src/mediaplugins/include/core/plugin_video_decode.h
index 6403852f..6403852f 100644
--- a/mediaplugin/src/plugins/media/include/core/plugin_video_decode.h
+++ b/mediaplugin/src/mediaplugins/include/core/plugin_video_decode.h
diff --git a/mediaplugin/src/plugins/media/include/core/util.h b/mediaplugin/src/mediaplugins/include/core/util.h
index 55c5e93f..55c5e93f 100644
--- a/mediaplugin/src/plugins/media/include/core/util.h
+++ b/mediaplugin/src/mediaplugins/include/core/util.h