diff --git a/configure.ac b/configure.ac
index 73ec183da97136bc982f72746c3f7fbbbf39c857..6cadc18d8d345460759de55e5eab8c7a31e96648 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5869,9 +5869,9 @@ AC_CONFIG_FILES([
   modules/audio_mixer/Makefile
   modules/audio_output/Makefile
   modules/codec/Makefile
+  modules/codec/avcodec/Makefile
   modules/codec/cmml/Makefile
   modules/codec/dmo/Makefile
-  modules/codec/ffmpeg/Makefile
   modules/codec/subtitles/Makefile
   modules/codec/spudec/Makefile
   modules/codec/xvmc/Makefile
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index b3cf15c039b9109e44c765083ea8bef9b4f47f3f..7b530e529b17414fd5694b58450cd68b2419ff3e 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = cmml dmo ffmpeg subtitles spudec xvmc
+SUBDIRS = cmml dmo avcodec subtitles spudec xvmc
 # Disabled modules
 SOURCES_a52 = a52.c
 SOURCES_cinepak = cinepak.c
diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/avcodec/Modules.am
similarity index 100%
rename from modules/codec/ffmpeg/Modules.am
rename to modules/codec/avcodec/Modules.am
diff --git a/modules/codec/ffmpeg/audio.c b/modules/codec/avcodec/audio.c
similarity index 100%
rename from modules/codec/ffmpeg/audio.c
rename to modules/codec/avcodec/audio.c
diff --git a/modules/codec/ffmpeg/avcodec.c b/modules/codec/avcodec/avcodec.c
similarity index 100%
rename from modules/codec/ffmpeg/avcodec.c
rename to modules/codec/avcodec/avcodec.c
diff --git a/modules/codec/ffmpeg/avcodec.h b/modules/codec/avcodec/avcodec.h
similarity index 100%
rename from modules/codec/ffmpeg/avcodec.h
rename to modules/codec/avcodec/avcodec.h
diff --git a/modules/codec/ffmpeg/avutil.h b/modules/codec/avcodec/avutil.h
similarity index 100%
rename from modules/codec/ffmpeg/avutil.h
rename to modules/codec/avcodec/avutil.h
diff --git a/modules/codec/ffmpeg/chroma.h b/modules/codec/avcodec/chroma.h
similarity index 100%
rename from modules/codec/ffmpeg/chroma.h
rename to modules/codec/avcodec/chroma.h
diff --git a/modules/codec/ffmpeg/deinterlace.c b/modules/codec/avcodec/deinterlace.c
similarity index 100%
rename from modules/codec/ffmpeg/deinterlace.c
rename to modules/codec/avcodec/deinterlace.c
diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/avcodec/encoder.c
similarity index 100%
rename from modules/codec/ffmpeg/encoder.c
rename to modules/codec/avcodec/encoder.c
diff --git a/modules/codec/ffmpeg/fourcc.h b/modules/codec/avcodec/fourcc.h
similarity index 100%
rename from modules/codec/ffmpeg/fourcc.h
rename to modules/codec/avcodec/fourcc.h
diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/avcodec/video.c
similarity index 100%
rename from modules/codec/ffmpeg/video.c
rename to modules/codec/avcodec/video.c
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 85711d01f5da567bc6298ee318b0e7a93e16df42..d60e2d89f8e580b107321398478c5f181892aaff 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -42,8 +42,8 @@
 #   include <ffmpeg/avformat.h>
 #endif
 
-#include "../../codec/ffmpeg/fourcc.h"
-#include "../../codec/ffmpeg/chroma.h"
+#include "../../codec/avcodec/fourcc.h"
+#include "../../codec/avcodec/chroma.h"
 
 //#define AVFORMAT_DEBUG 1
 
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index f3fc73b10b717259b43b1104dc2949545efe9ea2..14b19cef1488d79b18f8d424982b2a2e4413139c 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -41,8 +41,8 @@
 #endif
 
 #include "avformat.h"
-#include "../../codec/ffmpeg/fourcc.h"
-#include "../../codec/ffmpeg/avutil.h"
+#include "../../codec/avcodec/fourcc.h"
+#include "../../codec/avcodec/avutil.h"
 
 //#define AVFORMAT_DEBUG 1
 
diff --git a/modules/video_filter/imgresample.c b/modules/video_filter/imgresample.c
index 688debc4dcf1962976214f9a6d1b0d7a09ed9cbe..cbca27ea3551829926b19888af343b13a65a9fb5 100644
--- a/modules/video_filter/imgresample.c
+++ b/modules/video_filter/imgresample.c
@@ -43,7 +43,7 @@
 #   include <avcodec.h>
 #endif
 
-#include "../codec/ffmpeg/chroma.h"
+#include "../codec/avcodec/chroma.h"
 
 /*****************************************************************************
  * Local prototypes
diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index 65bf56104fc44efbedbdb6e6c012cd546ff662f2..24d603416d741c4073c8c67f042b0c6fdcf904ad 100644
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -41,7 +41,7 @@
 #endif
 
 /* Gruikkkkkkkkkk!!!!! */
-#include "../codec/ffmpeg/chroma.h"
+#include "../codec/avcodec/chroma.h"
 
 /****************************************************************************
  * Local prototypes