diff --git a/src/add-ons/media/plugins/ffmpeg/config.h b/src/add-ons/media/plugins/ffmpeg/config.h
index 589340f62f..35bfae65bb 100644
--- a/src/add-ons/media/plugins/ffmpeg/config.h
+++ b/src/add-ons/media/plugins/ffmpeg/config.h
@@ -284,14 +284,14 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
-#define CONFIG_AC3_DECODER 1
+#define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 1
 #define CONFIG_APE_DECODER 1
 #define CONFIG_ATRAC3_DECODER 1
 #define CONFIG_COOK_DECODER 1
 #define CONFIG_DCA_DECODER 1
 #define CONFIG_DSICINAUDIO_DECODER 1
-#define CONFIG_EAC3_DECODER 1
+#define CONFIG_EAC3_DECODER 0
 #define CONFIG_FLAC_DECODER 1
 #define CONFIG_IMC_DECODER 1
 #define CONFIG_MACE3_DECODER 1
diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
index 508ffb36f3..b46b471866 100644
--- a/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
@@ -27,8 +27,8 @@ StaticLibrary libavcodec.a :
 	aasc.c
 	ac3.c
 	ac3_parser.c
-	ac3dec.c
-	ac3dec_data.c
+#	ac3dec.c # GPL
+#	ac3dec_data.c # GPL
 	ac3enc.c
 	ac3tab.c
 	acelp_filters.c
@@ -92,7 +92,7 @@ StaticLibrary libavcodec.a :
 	faandct.c
 	faanidct.c
 	faxcompr.c
-#	fdctref.c
+#	fdctref.c # GPL, only used for DCT test program
 	fft.c
 	ffv1.c
 	flacdec.c