diff --git a/ext_libs/Makefile.mingw b/ext_libs/Makefile.mingw
index 231a066b..ac03eadd 100644
--- a/ext_libs/Makefile.mingw
+++ b/ext_libs/Makefile.mingw
@@ -17,5 +17,14 @@ libg719_decode.a: libg719_decode.def
 libat3plusdecoder.a: at3plusdecoder.def
 	$(DLLTOOL) -d at3plusdecoder.def -l libat3plusdecoder.a
 
+libavcodec.a: avcodec-vgmstream-57.dll avcodec-vgmstream-57.def
+	$(DLLTOOL) -D avcodec-vgmstream-57.dll -d avcodec-vgmstream-57.def -l libavcodec.a
+
+libavformat.a: avformat-vgmstream-57.dll avformat-vgmstream-57.def
+	$(DLLTOOL) -D avformat-vgmstream-57.dll -d avformat-vgmstream-57.def -l libavformat.a
+
+libavutil.a: avutil-vgmstream-55.dll avutil-vgmstream-55.def
+	$(DLLTOOL) -D avutil-vgmstream-55.dll -d avutil-vgmstream-55.def -l libavutil.a
+
 clean:
-	rm -f libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a
+	rm -f libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a
diff --git a/test/Makefile.mingw b/test/Makefile.mingw
index dbcebc5d..94bde73d 100644
--- a/test/Makefile.mingw
+++ b/test/Makefile.mingw
@@ -1,11 +1,11 @@
 # optional parts
-VGM_ENABLE_FFMPEG=0
+VGM_ENABLE_FFMPEG=1
 ifeq ($(VGM_ENABLE_FFMPEG),1)
-FFMPEG_CC=-DVGM_USE_FFMPEG -DVGM_USE_FFMPEG_ACCURATE_LOOPING -I../../vgmstream-ffmpeg/include
-FFMPEG_LD=-L../../vgmstream-ffmpeg/lib -lavcodec -lavformat -lavutil
+FFMPEG_CC=-DVGM_USE_FFMPEG -DVGM_USE_FFMPEG_ACCURATE_LOOPING
+FFMPEG_LD=-lavcodec -lavformat -lavutil
 endif
 
-VGM_ENABLE_MAIATRAC3PLUS=1
+VGM_ENABLE_MAIATRAC3PLUS=0
 ifeq ($(VGM_ENABLE_MAIATRAC3PLUS),1) 
 MAT3P_CC=-DVGM_USE_MAIATRAC3PLUS
 MAT3P_LD=-lat3plusdecoder
@@ -31,9 +31,9 @@ export CC=i686-w64-mingw32-gcc
 export AR=i686-w64-mingw32-ar
 export STRIP=i686-w64-mingw32-strip
 
-.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a
+.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a
 
-test.exe: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a
+test.exe: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a
 	$(CC) $(CFLAGS) "-DVERSION=\"`../version.sh`\"" test.c $(LDFLAGS) -o test.exe
 	$(STRIP) test.exe
 
@@ -54,6 +54,15 @@ libg719_decode.a:
 
 libat3plusdecoder.a:
 	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
-	 
+
+libavcodec.a:
+	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
+
+libavformat.a:
+	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
+
+libavutil.a:
+	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
+
 clean:
 	rm -f test.exe
diff --git a/winamp/Makefile b/winamp/Makefile
index ef4c00e1..76c67195 100644
--- a/winamp/Makefile
+++ b/winamp/Makefile
@@ -1,11 +1,11 @@
 # optional parts
-VGM_ENABLE_FFMPEG=0
+VGM_ENABLE_FFMPEG=1
 ifeq ($(VGM_ENABLE_FFMPEG),1)
-FFMPEG_CC=-DVGM_USE_FFMPEG -DVGM_USE_FFMPEG_ACCURATE_LOOPING -I../../vgmstream-ffmpeg/include
-FFMPEG_LD=-L../../vgmstream-ffmpeg/lib -lavcodec -lavformat -lavutil
+FFMPEG_CC=-DVGM_USE_FFMPEG -DVGM_USE_FFMPEG_ACCURATE_LOOPING
+FFMPEG_LD=-lavcodec -lavformat -lavutil
 endif
 
-VGM_ENABLE_MAIATRAC3PLUS=1
+VGM_ENABLE_MAIATRAC3PLUS=0
 ifeq ($(VGM_ENABLE_MAIATRAC3PLUS),1) 
 MAT3P_CC=-DVGM_USE_MAIATRAC3PLUS
 MAT3P_LD=-lat3plusdecoder
@@ -33,9 +33,9 @@ export WINDRES=i586-mingw32msvc-windres
 #export STRIP=i686-w64-mingw32-strip
 #export WINDRES=i686-w64-mingw32-windres
 
-.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a at3plusdecoder.a
+.PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a
 
-in_vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a in_vgmstream.c resource.o
+in_vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libat3plusdecoder.a libavcodec.a libavformat.a libavutil.a resource.o
 	$(CC) -shared -static-libgcc $(CFLAGS) "-DVERSION=\"`../version.sh`\"" in_vgmstream.c resource.o $(LDFLAGS) -o in_vgmstream.dll
 	$(STRIP) in_vgmstream.dll
 
@@ -60,5 +60,14 @@ libg719_decode.a:
 libat3plusdecoder.a:
 	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
 
+libavcodec.a:
+	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
+
+libavformat.a:
+	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
+
+libavutil.a:
+	$(MAKE) -C ../ext_libs -f Makefile.mingw $@
+
 clean:
 	rm -f in_vgmstream.dll resource.o