diff --git a/src/add-ons/media/plugins/Jamfile b/src/add-ons/media/plugins/Jamfile
index 05333e53a0..15e6dc4d1c 100644
--- a/src/add-ons/media/plugins/Jamfile
+++ b/src/add-ons/media/plugins/Jamfile
@@ -3,26 +3,23 @@ SubDir HAIKU_TOP src add-ons media plugins ;
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 SubInclude HAIKU_TOP src add-ons media plugins aiff_reader ;
+SubInclude HAIKU_TOP src add-ons media plugins ape_reader ;
+SubInclude HAIKU_TOP src add-ons media plugins asf_reader ;
 SubInclude HAIKU_TOP src add-ons media plugins au_reader ;
 SubInclude HAIKU_TOP src add-ons media plugins avi_reader ;
-SubInclude HAIKU_TOP src add-ons media plugins mp3_reader ;
-SubInclude HAIKU_TOP src add-ons media plugins wav_reader ;
-SubInclude HAIKU_TOP src add-ons media plugins ape_reader ;
-
+SubInclude HAIKU_TOP src add-ons media plugins ffmpeg ;
 SubInclude HAIKU_TOP src add-ons media plugins matroska ;
+SubInclude HAIKU_TOP src add-ons media plugins mov_reader ;
+SubInclude HAIKU_TOP src add-ons media plugins mp3_decoder ;
+SubInclude HAIKU_TOP src add-ons media plugins mp3_reader ;
+SubInclude HAIKU_TOP src add-ons media plugins mp4_reader ;
 SubInclude HAIKU_TOP src add-ons media plugins musepack ;
 SubInclude HAIKU_TOP src add-ons media plugins ogg ;
-
-SubInclude HAIKU_TOP src add-ons media plugins mp3_decoder ;
 SubInclude HAIKU_TOP src add-ons media plugins raw_decoder ;
-
-SubInclude HAIKU_TOP src add-ons media plugins avcodec ;
-SubInclude HAIKU_TOP src add-ons media plugins vorbis ;
 SubInclude HAIKU_TOP src add-ons media plugins speex ;
-SubInclude HAIKU_TOP src add-ons media plugins mov_reader ;
-SubInclude HAIKU_TOP src add-ons media plugins mp4_reader ;
-
-SubInclude HAIKU_TOP src add-ons media plugins asf_reader ;
+#SubInclude HAIKU_TOP src add-ons media plugins theora ;
+SubInclude HAIKU_TOP src add-ons media plugins vorbis ;
+SubInclude HAIKU_TOP src add-ons media plugins wav_reader ;
 
 # The following add-ons are GPL licensed, and can only be used with
 # software whose license is GPL compatible. To include these GPL
diff --git a/src/add-ons/media/plugins/avcodec/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/AVCodecDecoder.cpp
rename to src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
diff --git a/src/add-ons/media/plugins/avcodec/AVCodecDecoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/AVCodecDecoder.h
rename to src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
diff --git a/src/add-ons/media/plugins/avcodec/AVFormatReader.cpp b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/AVFormatReader.cpp
rename to src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
diff --git a/src/add-ons/media/plugins/avcodec/AVFormatReader.h b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/AVFormatReader.h
rename to src/add-ons/media/plugins/ffmpeg/AVFormatReader.h
diff --git a/src/add-ons/media/plugins/avcodec/COPYING.GPL b/src/add-ons/media/plugins/ffmpeg/COPYING.GPL
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/COPYING.GPL
rename to src/add-ons/media/plugins/ffmpeg/COPYING.GPL
diff --git a/src/add-ons/media/plugins/avcodec/COPYING.LGPL b/src/add-ons/media/plugins/ffmpeg/COPYING.LGPL
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/COPYING.LGPL
rename to src/add-ons/media/plugins/ffmpeg/COPYING.LGPL
diff --git a/src/add-ons/media/plugins/avcodec/CodecTable.cpp b/src/add-ons/media/plugins/ffmpeg/CodecTable.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/CodecTable.cpp
rename to src/add-ons/media/plugins/ffmpeg/CodecTable.cpp
diff --git a/src/add-ons/media/plugins/avcodec/CodecTable.h b/src/add-ons/media/plugins/ffmpeg/CodecTable.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/CodecTable.h
rename to src/add-ons/media/plugins/ffmpeg/CodecTable.h
diff --git a/src/add-ons/media/plugins/avcodec/FFmpegPlugin.cpp b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/FFmpegPlugin.cpp
rename to src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
diff --git a/src/add-ons/media/plugins/avcodec/FFmpegPlugin.h b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/FFmpegPlugin.h
rename to src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h
diff --git a/src/add-ons/media/plugins/avcodec/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
similarity index 63%
rename from src/add-ons/media/plugins/avcodec/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/Jamfile
index b8de4dfdc7..19fd13ae47 100644
--- a/src/add-ons/media/plugins/avcodec/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -31,7 +31,7 @@ Addon ffmpeg :
 	libz.a
 ;
 
-SubInclude HAIKU_TOP src add-ons media plugins avcodec libavcodec ;
-SubInclude HAIKU_TOP src add-ons media plugins avcodec libavformat ;
-SubInclude HAIKU_TOP src add-ons media plugins avcodec libavutil ;
-SubInclude HAIKU_TOP src add-ons media plugins avcodec libswscale ;
+SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavcodec ;
+SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavformat ;
+SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavutil ;
+SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libswscale ;
diff --git a/src/add-ons/media/plugins/avcodec/config.h b/src/add-ons/media/plugins/ffmpeg/config.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/config.h
rename to src/add-ons/media/plugins/ffmpeg/config.h
diff --git a/src/add-ons/media/plugins/avcodec/gen_lookup.cpp b/src/add-ons/media/plugins/ffmpeg/gen_lookup.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/gen_lookup.cpp
rename to src/add-ons/media/plugins/ffmpeg/gen_lookup.cpp
diff --git a/src/add-ons/media/plugins/avcodec/gfx_conv_c.cpp b/src/add-ons/media/plugins/ffmpeg/gfx_conv_c.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/gfx_conv_c.cpp
rename to src/add-ons/media/plugins/ffmpeg/gfx_conv_c.cpp
diff --git a/src/add-ons/media/plugins/avcodec/gfx_conv_c.h b/src/add-ons/media/plugins/ffmpeg/gfx_conv_c.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/gfx_conv_c.h
rename to src/add-ons/media/plugins/ffmpeg/gfx_conv_c.h
diff --git a/src/add-ons/media/plugins/avcodec/gfx_conv_c_lookup.cpp b/src/add-ons/media/plugins/ffmpeg/gfx_conv_c_lookup.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/gfx_conv_c_lookup.cpp
rename to src/add-ons/media/plugins/ffmpeg/gfx_conv_c_lookup.cpp
diff --git a/src/add-ons/media/plugins/avcodec/gfx_conv_mmx.h b/src/add-ons/media/plugins/ffmpeg/gfx_conv_mmx.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/gfx_conv_mmx.h
rename to src/add-ons/media/plugins/ffmpeg/gfx_conv_mmx.h
diff --git a/src/add-ons/media/plugins/avcodec/gfx_util.cpp b/src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/gfx_util.cpp
rename to src/add-ons/media/plugins/ffmpeg/gfx_util.cpp
diff --git a/src/add-ons/media/plugins/avcodec/gfx_util.h b/src/add-ons/media/plugins/ffmpeg/gfx_util.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/gfx_util.h
rename to src/add-ons/media/plugins/ffmpeg/gfx_util.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/4xm.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/4xm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/4xm.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/4xm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/8bps.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/8bps.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/8bps.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/8bps.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/8svx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/8svx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/8svx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/8svx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
similarity index 96%
rename from src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
index 36cec0fc6a..b83a1410b5 100644
--- a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec libavcodec ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg libavcodec ;
 
 SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(TARGET_ARCH) ] ;
@@ -310,5 +310,6 @@ StaticLibrary libavcodec.a :
 	zmbv.c
 ;
 
-SubInclude HAIKU_TOP src add-ons media plugins avcodec libavcodec $(TARGET_ARCH) ;
+SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavcodec
+	$(TARGET_ARCH) ;
 
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aac.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aac.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aac.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aac.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aac.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/aac.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aac.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aac.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aac_ac3_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aac_ac3_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aac_ac3_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aac_ac3_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aac_ac3_parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/aac_ac3_parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aac_ac3_parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aac_ac3_parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aac_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aac_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aac_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aac_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aac_parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/aac_parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aac_parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aac_parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aacdectab.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/aacdectab.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aacdectab.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aacdectab.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aacenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aacenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aacenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aacenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aacpsy.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aacpsy.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aacpsy.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aacpsy.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aacpsy.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/aacpsy.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aacpsy.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aacpsy.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aactab.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aactab.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aactab.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aactab.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aactab.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/aactab.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aactab.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aactab.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aandcttab.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aandcttab.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aandcttab.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aandcttab.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aandcttab.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/aandcttab.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aandcttab.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aandcttab.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/aasc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/aasc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/aasc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/aasc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3_parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3_parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3_parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3_parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3dec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3dec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3dec_data.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec_data.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3dec_data.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec_data.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3dec_data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec_data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3dec_data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3dec_data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3tab.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3tab.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3tab.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3tab.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ac3tab.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ac3tab.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ac3tab.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ac3tab.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/acelp_filters.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_filters.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/acelp_filters.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_filters.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/acelp_filters.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_filters.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/acelp_filters.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_filters.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/acelp_pitch_delay.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_pitch_delay.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/acelp_pitch_delay.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_pitch_delay.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/acelp_pitch_delay.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_pitch_delay.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/acelp_pitch_delay.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_pitch_delay.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/acelp_vectors.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_vectors.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/acelp_vectors.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_vectors.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/acelp_vectors.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_vectors.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/acelp_vectors.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/acelp_vectors.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/adpcm.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/adpcm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/adpcm.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/adpcm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/adx.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/adx.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/adx.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/adx.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/adxdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/adxdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/adxdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/adxdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/adxenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/adxenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/adxenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/adxenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/alac.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/alac.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/alac.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/alac.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/alacenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/alacenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/alacenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/alacenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/allcodecs.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/allcodecs.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/allcodecs.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/allcodecs.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/apedec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/apedec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/apedec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/apedec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/apiexample.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/apiexample.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/apiexample.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/apiexample.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/asv1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/asv1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/asv1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/asv1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/atrac3.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/atrac3.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/atrac3.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/atrac3.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/atrac3data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/atrac3data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/atrac3data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/atrac3data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/audioconvert.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/audioconvert.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/audioconvert.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/audioconvert.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/audioconvert.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/audioconvert.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/audioconvert.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/audioconvert.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/avcodec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/avcodec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/avcodec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/avcodec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/avs.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/avs.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/avs.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/avs.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/beosthread.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/beosthread.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/beosthread.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/beosthread.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bethsoftvideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/bethsoftvideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bethsoftvideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bethsoftvideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bethsoftvideo.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/bethsoftvideo.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bethsoftvideo.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bethsoftvideo.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bfi.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/bfi.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bfi.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bfi.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bitstream.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/bitstream.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bitstream.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bitstream.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bitstream.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/bitstream.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bitstream.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bitstream.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bitstream_filter.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/bitstream_filter.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bitstream_filter.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bitstream_filter.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bmp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/bmp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bmp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bmp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bmp.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/bmp.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bmp.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bmp.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bmpenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/bmpenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bmpenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bmpenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/bytestream.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/bytestream.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/bytestream.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/bytestream.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/c93.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/c93.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/c93.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/c93.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cabac.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cabac.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cabac.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cabac.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cabac.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/cabac.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cabac.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cabac.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cavs.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cavs.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cavs.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cavs.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cavs.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/cavs.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cavs.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cavs.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cavs_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cavs_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cavs_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cavs_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cavsdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/cavsdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cavsdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cavsdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cavsdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cavsdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cavsdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cavsdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cavsdsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cavsdsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cavsdsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cavsdsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/celp_filters.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/celp_filters.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/celp_filters.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/celp_filters.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/celp_filters.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/celp_filters.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/celp_filters.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/celp_filters.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/celp_math.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/celp_math.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/celp_math.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/celp_math.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/celp_math.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/celp_math.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/celp_math.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/celp_math.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cinepak.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cinepak.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cinepak.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cinepak.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cljr.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cljr.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cljr.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cljr.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/colorspace.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/colorspace.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/colorspace.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/colorspace.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cook.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cook.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cook.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cook.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cookdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/cookdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cookdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cookdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cscd.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cscd.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cscd.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cscd.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/cyuv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/cyuv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/cyuv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/cyuv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dca.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dca.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dca.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dca.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dca.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/dca.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dca.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dca.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dca_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dca_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dca_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dca_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dcadata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/dcadata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dcadata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dcadata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dcahuff.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/dcahuff.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dcahuff.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dcahuff.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dct-test.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dct-test.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dct-test.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dct-test.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dirac_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dirac_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dirac_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dirac_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dnxhd_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhd_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dnxhd_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhd_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dnxhddata.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhddata.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dnxhddata.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhddata.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dnxhddata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhddata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dnxhddata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhddata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dnxhddec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhddec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dnxhddec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhddec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dnxhdenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhdenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dnxhdenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhdenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dnxhdenc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhdenc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dnxhdenc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dnxhdenc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dpcm.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dpcm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dpcm.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dpcm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dsicinav.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dsicinav.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dsicinav.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dsicinav.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dsputil.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dsputil.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dsputil.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dsputil.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dsputil.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/dsputil.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dsputil.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dsputil.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dump_extradata_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dump_extradata_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dump_extradata_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dump_extradata_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dvbsub.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dvbsub.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dvbsub.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dvbsub.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dvbsub_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dvbsub_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dvbsub_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dvbsub_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dvbsubdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dvbsubdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dvbsubdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dvbsubdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dvdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/dvdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dvdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dvdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dvdsub_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dvdsub_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dvdsub_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dvdsub_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dvdsubdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dvdsubdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dvdsubdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dvdsubdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dvdsubenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dvdsubenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dvdsubenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dvdsubenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/dxa.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/dxa.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/dxa.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/dxa.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eac3dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/eac3dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eac3dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eac3dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eacmv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/eacmv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eacmv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eacmv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eaidct.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/eaidct.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eaidct.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eaidct.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eatgq.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/eatgq.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eatgq.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eatgq.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eatgv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/eatgv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eatgv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eatgv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eatqi.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/eatqi.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eatqi.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eatqi.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/elbg.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/elbg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/elbg.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/elbg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/elbg.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/elbg.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/elbg.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/elbg.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/error_resilience.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/error_resilience.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/error_resilience.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/error_resilience.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/escape124.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/escape124.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/escape124.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/escape124.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eval.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/eval.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eval.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eval.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/eval.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/eval.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/eval.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/eval.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/faandct.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/faandct.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/faandct.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/faandct.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/faandct.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/faandct.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/faandct.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/faandct.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/faanidct.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/faanidct.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/faanidct.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/faanidct.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/faanidct.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/faanidct.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/faanidct.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/faanidct.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/faxcompr.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/faxcompr.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/faxcompr.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/faxcompr.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/faxcompr.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/faxcompr.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/faxcompr.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/faxcompr.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/fdctref.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/fdctref.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/fdctref.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/fdctref.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/fft-test.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/fft-test.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/fft-test.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/fft-test.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/fft.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/fft.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/fft.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/fft.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ffv1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ffv1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ffv1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ffv1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/flac.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/flac.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/flac.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/flac.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/flacdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/flacdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/flacdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/flacdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/flacenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/flacenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/flacenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/flacenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/flashsv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/flashsv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/flashsv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/flashsv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/flashsvenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/flashsvenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/flashsvenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/flashsvenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/flicvideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/flicvideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/flicvideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/flicvideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/fraps.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/fraps.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/fraps.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/fraps.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/g726.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/g726.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/g726.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/g726.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/g729.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/g729.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/g729.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/g729.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/g729data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/g729data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/g729data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/g729data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/g729dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/g729dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/g729dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/g729dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/gif.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/gif.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/gif.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/gif.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/gifdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/gifdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/gifdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/gifdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/golomb.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/golomb.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/golomb.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/golomb.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/golomb.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/golomb.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/golomb.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/golomb.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h261.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h261.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h261.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h261.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h261.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h261.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h261.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h261.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h261_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h261_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h261_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h261_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h261data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h261data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h261data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h261data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h261dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h261dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h261dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h261dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h261enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h261enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h261enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h261enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h263.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h263.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h263.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h263.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h263.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h263.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h263.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h263.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h263_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h263_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h263_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h263_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h263_parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h263_parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h263_parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h263_parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h263data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h263data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h263data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h263data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h263dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h263dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h263dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h263dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264_mp4toannexb_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264_mp4toannexb_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264_parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264_parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264_parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264_parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264dspenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264dspenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264dspenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264dspenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264idct.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264idct.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264idct.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264idct.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264pred.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264pred.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264pred.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264pred.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/h264pred.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/h264pred.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/h264pred.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/h264pred.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/huffman.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/huffman.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/huffman.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/huffman.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/huffman.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/huffman.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/huffman.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/huffman.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/huffyuv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/huffyuv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/huffyuv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/huffyuv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/idcinvideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/idcinvideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/idcinvideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/idcinvideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/iirfilter.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/iirfilter.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/iirfilter.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/iirfilter.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/iirfilter.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/iirfilter.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/iirfilter.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/iirfilter.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/imc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/imc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/imc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/imc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/imcdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/imcdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/imcdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/imcdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/imgconvert.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/imgconvert.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/imgconvert.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/imgconvert.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/imgconvert.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/imgconvert.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/imgconvert.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/imgconvert.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/imgconvert_template.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/imgconvert_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/imgconvert_template.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/imgconvert_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/imgresample.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/imgresample.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/imgresample.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/imgresample.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/imx_dump_header_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/imx_dump_header_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/imx_dump_header_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/imx_dump_header_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/indeo2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/indeo2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/indeo2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/indeo2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/indeo2data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/indeo2data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/indeo2data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/indeo2data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/indeo3.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/indeo3.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/indeo3.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/indeo3.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/indeo3data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/indeo3data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/indeo3data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/indeo3data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/internal.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/internal.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/internal.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/internal.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/interplayvideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/interplayvideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/interplayvideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/interplayvideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/intrax8.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/intrax8.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/intrax8.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/intrax8.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/intrax8dsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8dsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/intrax8dsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8dsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/intrax8huf.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8huf.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/intrax8huf.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/intrax8huf.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jfdctfst.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/jfdctfst.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jfdctfst.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jfdctfst.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jfdctint.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/jfdctint.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jfdctint.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jfdctint.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jpegls.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/jpegls.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jpegls.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jpegls.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jpegls.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/jpegls.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jpegls.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jpegls.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jpeglsdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/jpeglsdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jpeglsdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jpeglsdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jpeglsdec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/jpeglsdec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jpeglsdec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jpeglsdec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jpeglsenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/jpeglsenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jpeglsenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jpeglsenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/jrevdct.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/jrevdct.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/jrevdct.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/jrevdct.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/kmvc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/kmvc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/kmvc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/kmvc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lcl.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/lcl.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lcl.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lcl.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lcldec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/lcldec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lcldec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lcldec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lclenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/lclenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lclenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lclenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libamr.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libamr.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libamr.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libamr.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libdirac.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/libdirac.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libdirac.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libdirac.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libdirac_libschro.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libdirac_libschro.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libdirac_libschro.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libdirac_libschro.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libdirac_libschro.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/libdirac_libschro.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libdirac_libschro.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libdirac_libschro.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libdiracdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libdiracdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libdiracdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libdiracdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libdiracenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libdiracenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libdiracenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libdiracenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libfaac.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libfaac.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libfaac.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libfaac.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libfaad.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libfaad.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libfaad.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libfaad.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libgsm.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libgsm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libgsm.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libgsm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libmp3lame.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libmp3lame.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libmp3lame.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libmp3lame.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libopenjpeg.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libopenjpeg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libopenjpeg.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libopenjpeg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libschroedinger.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedinger.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libschroedinger.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedinger.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libschroedinger.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedinger.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libschroedinger.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedinger.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libschroedingerdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedingerdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libschroedingerdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedingerdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libschroedingerenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedingerenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libschroedingerenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libschroedingerenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libspeexdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libspeexdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libspeexdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libspeexdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libtheoraenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libtheoraenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libtheoraenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libtheoraenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libvorbis.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libvorbis.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libvorbis.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libvorbis.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libx264.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libx264.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libx264.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libx264.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libxvid_internal.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/libxvid_internal.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libxvid_internal.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libxvid_internal.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libxvid_rc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libxvid_rc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libxvid_rc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libxvid_rc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/libxvidff.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/libxvidff.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/libxvidff.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/libxvidff.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ljpegenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ljpegenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ljpegenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ljpegenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/loco.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/loco.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/loco.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/loco.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lpc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/lpc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lpc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lpc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lpc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/lpc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lpc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lpc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/lsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lsp.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/lsp.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lsp.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lsp.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lzw.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/lzw.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lzw.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lzw.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lzw.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/lzw.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lzw.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lzw.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/lzwenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/lzwenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/lzwenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/lzwenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mace.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mace.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mace.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mace.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mathops.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mathops.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mathops.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mathops.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mdct.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mdct.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mdct.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mdct.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mimic.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mimic.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mimic.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mimic.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpeg.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpeg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpeg.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpeg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpeg.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpeg.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpeg.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpeg.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpeg_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpeg_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpeg_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpeg_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpega_dump_header_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpega_dump_header_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpega_dump_header_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpega_dump_header_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpegbdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegbdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpegbdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegbdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpegdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpegdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpegdec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegdec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpegdec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegdec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpegenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpegenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mjpegenc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegenc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mjpegenc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mjpegenc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mlp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mlp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mlp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mlp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mlp.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mlp.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mlp.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mlp.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mlp_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mlp_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mlp_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mlp_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mlp_parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mlp_parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mlp_parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mlp_parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mlpdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mlpdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mlpdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mlpdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mmvideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mmvideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mmvideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mmvideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/motion-test.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/motion-test.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/motion-test.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/motion-test.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/motion_est.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/motion_est.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/motion_est.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/motion_est.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/motion_est_template.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/motion_est_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/motion_est_template.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/motion_est_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/motionpixels.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/motionpixels.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/motionpixels.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/motionpixels.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/movsub_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/movsub_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/movsub_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/movsub_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mp3_header_compress_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mp3_header_compress_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mp3_header_compress_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mp3_header_compress_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mp3_header_decompress_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mp3_header_decompress_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mp3_header_decompress_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mp3_header_decompress_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpc7.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpc7.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpc7.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpc7.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpc7data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpc7data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpc7data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpc7data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpc8.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpc8.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpc8.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpc8.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpc8data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpc8data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpc8data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpc8data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpc8huff.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpc8huff.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpc8huff.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpc8huff.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpcdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpcdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpcdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpcdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg12.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg12.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg12.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg12.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg12data.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12data.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg12data.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12data.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg12data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg12data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg12decdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12decdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg12decdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12decdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg12enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg12enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg12enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg4audio.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4audio.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg4audio.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4audio.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg4audio.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4audio.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg4audio.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4audio.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg4data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg4data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg4video_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4video_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg4video_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4video_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpeg4video_parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4video_parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpeg4video_parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpeg4video_parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudio.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudio.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudio.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudio.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudio.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudio.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudio.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudio.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudio_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudio_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudio_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudio_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodata.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodata.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodata.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodata.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodecheader.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodecheader.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodecheader.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodecheader.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodecheader.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodecheader.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodecheader.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodecheader.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodectab.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodectab.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiodectab.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiodectab.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudioenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudioenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudioenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudioenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiotab.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiotab.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegaudiotab.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegaudiotab.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_common.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_common.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_common.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_common.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_xvmc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_xvmc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/mpegvideo_xvmc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/mpegvideo_xvmc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4data.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4data.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4data.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4data.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msmpeg4data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msmpeg4data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msrle.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/msrle.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msrle.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msrle.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msrledec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/msrledec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msrledec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msrledec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msrledec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/msrledec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msrledec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msrledec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/msvideo1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/msvideo1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/msvideo1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/msvideo1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/nellymoser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/nellymoser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/nellymoser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/nellymoser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/nellymoserdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoserdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/nellymoserdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoserdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/nellymoserenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoserenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/nellymoserenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/nellymoserenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/noise_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/noise_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/noise_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/noise_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/nuv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/nuv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/nuv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/nuv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/opt.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/opt.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/opt.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/opt.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/opt.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/opt.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/opt.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/opt.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/options.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/options.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/options.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/options.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/os2thread.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/os2thread.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/os2thread.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/os2thread.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/parser.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/parser.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/parser.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/parser.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pcm.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pcm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pcm.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pcm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pcx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pcx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pcx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pcx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pixdesc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pixdesc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pixdesc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pixdesc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pixdesc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/pixdesc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pixdesc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pixdesc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/png.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/png.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/png.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/png.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/png.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/png.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/png.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/png.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pngdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pngdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pngdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pngdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pngenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pngenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pngenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pngenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pnm.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pnm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pnm.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pnm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pnm.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/pnm.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pnm.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pnm.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pnm_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pnm_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pnm_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pnm_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pnmenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pnmenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pnmenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pnmenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/Jamfile
similarity index 94%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/Jamfile
index abaa9a8d3c..a2f0364b87 100644
--- a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec libavcodec ppc ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg libavcodec ppc ;
 
 SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ../.. ] ;
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/check_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/check_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/check_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/check_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_altivec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_altivec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_altivec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_altivec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_ppc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_ppc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_ppc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_ppc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_ppc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_ppc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/dsputil_ppc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/dsputil_ppc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/fdct_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/fdct_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/fdct_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/fdct_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/fft_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/fft_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/fft_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/fft_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/float_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/float_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/float_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/float_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/gcc_fixes.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/gcc_fixes.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/gcc_fixes.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/gcc_fixes.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/gmc_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/gmc_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/gmc_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/gmc_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/h264_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/h264_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/h264_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/h264_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/h264_template_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/h264_template_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/h264_template_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/h264_template_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/idct_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/idct_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/idct_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/idct_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/imgresample_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/imgresample_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/imgresample_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/imgresample_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/imgresample_altivec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/imgresample_altivec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/imgresample_altivec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/imgresample_altivec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/int_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/int_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/int_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/int_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/mathops.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/mathops.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/mathops.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/mathops.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/mpegvideo_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/mpegvideo_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/mpegvideo_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/mpegvideo_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/snow_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/snow_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/snow_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/snow_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/types_altivec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/types_altivec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/types_altivec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/types_altivec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/util_altivec.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/util_altivec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/util_altivec.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/util_altivec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ppc/vc1dsp_altivec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ppc/vc1dsp_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/pthread.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/pthread.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/pthread.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/pthread.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ptx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ptx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ptx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ptx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qcelp_lsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/qcelp_lsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qcelp_lsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qcelp_lsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qcelpdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/qcelpdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qcelpdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qcelpdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qcelpdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/qcelpdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qcelpdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qcelpdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qdm2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/qdm2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qdm2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qdm2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qdm2data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/qdm2data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qdm2data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qdm2data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qdrw.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/qdrw.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qdrw.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qdrw.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qpeg.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/qpeg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qpeg.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qpeg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qtrle.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/qtrle.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qtrle.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qtrle.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/qtrleenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/qtrleenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/qtrleenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/qtrleenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ra144.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ra144.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ra144.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ra144.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ra144.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ra144.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ra144.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ra144.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ra288.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ra288.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ra288.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ra288.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ra288.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ra288.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ra288.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ra288.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rangecoder.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rangecoder.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rangecoder.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rangecoder.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rangecoder.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rangecoder.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rangecoder.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rangecoder.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ratecontrol.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ratecontrol.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ratecontrol.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ratecontrol.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ratecontrol.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ratecontrol.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ratecontrol.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ratecontrol.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/raw.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/raw.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/raw.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/raw.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/raw.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/raw.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/raw.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/raw.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rawdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rawdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rawdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rawdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rawenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rawenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rawenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rawenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rdft.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rdft.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rdft.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rdft.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rectangle.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rectangle.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rectangle.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rectangle.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/remove_extradata_bsf.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/remove_extradata_bsf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/remove_extradata_bsf.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/remove_extradata_bsf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/resample.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/resample.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/resample.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/resample.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/resample2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/resample2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/resample2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/resample2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rl.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rl.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rl.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rl.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rl2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rl2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rl2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rl2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rle.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rle.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rle.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rle.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rle.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rle.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rle.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rle.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/roqaudioenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/roqaudioenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/roqaudioenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/roqaudioenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/roqvideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/roqvideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/roqvideo.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideo.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/roqvideo.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideo.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/roqvideodec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideodec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/roqvideodec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideodec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/roqvideoenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideoenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/roqvideoenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/roqvideoenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rpza.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rpza.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rpza.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rpza.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rtjpeg.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rtjpeg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rtjpeg.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rtjpeg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rtjpeg.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rtjpeg.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rtjpeg.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rtjpeg.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv10.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv10.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv10.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv10.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv30.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv30.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv30.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv30.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv30data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv30data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv30data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv30data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv30dsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv30dsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv30dsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv30dsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv34.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv34.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv34.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv34.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv34.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv34.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv34.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv34.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv34data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv34data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv34data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv34data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv34vlc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv34vlc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv34vlc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv34vlc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv40.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv40.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv40.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv40.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv40data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv40data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv40data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv40data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv40dsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv40dsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv40dsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv40dsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/rv40vlc2.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/rv40vlc2.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/rv40vlc2.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/rv40vlc2.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/s3tc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/s3tc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/s3tc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/s3tc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/s3tc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/s3tc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/s3tc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/s3tc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sgi.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/sgi.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sgi.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sgi.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sgidec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/sgidec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sgidec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sgidec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sgienc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/sgienc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sgienc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sgienc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/shorten.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/shorten.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/shorten.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/shorten.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/simple_idct.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/simple_idct.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/simple_idct.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/simple_idct.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/simple_idct.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/simple_idct.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/simple_idct.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/simple_idct.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/smacker.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/smacker.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/smacker.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/smacker.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/smc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/smc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/smc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/smc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/snow.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/snow.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/snow.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/snow.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/snow.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/snow.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/snow.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/snow.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sonic.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/sonic.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sonic.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sonic.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sp5x.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/sp5x.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sp5x.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sp5x.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sp5xdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/sp5xdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sp5xdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sp5xdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sparc/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/Jamfile
similarity index 95%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sparc/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/Jamfile
index 27e5975b0b..1b16646db1 100644
--- a/src/add-ons/media/plugins/avcodec/libavcodec/sparc/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec libavcodec sparc ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg libavcodec sparc ;
 
 SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ../.. ] ;
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sparc/dsputil_vis.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/dsputil_vis.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sparc/dsputil_vis.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/dsputil_vis.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sparc/simple_idct_vis.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/simple_idct_vis.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sparc/simple_idct_vis.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/simple_idct_vis.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sparc/vis.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/vis.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sparc/vis.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sparc/vis.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/sunrast.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/sunrast.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/sunrast.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/sunrast.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq1.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq1.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq1.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq1.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq1_cb.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq1_cb.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq1_cb.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq1_cb.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq1_vlc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq1_vlc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq1_vlc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq1_vlc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq1dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq1dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq1dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq1dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq1enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq1enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq1enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq1enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq1enc_cb.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq1enc_cb.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq1enc_cb.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq1enc_cb.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/svq3.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/svq3.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/svq3.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/svq3.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/targa.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/targa.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/targa.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/targa.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/targaenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/targaenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/targaenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/targaenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/tiertexseqv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/tiertexseqv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/tiertexseqv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/tiertexseqv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/tiff.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/tiff.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/tiff.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/tiff.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/tiff.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/tiff.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/tiff.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/tiff.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/tiffenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/tiffenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/tiffenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/tiffenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/truemotion1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/truemotion1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/truemotion1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/truemotion1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/truemotion1data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/truemotion1data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/truemotion1data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/truemotion1data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/truemotion2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/truemotion2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/truemotion2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/truemotion2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/truespeech.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/truespeech.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/truespeech.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/truespeech.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/truespeech_data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/truespeech_data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/truespeech_data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/truespeech_data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/tscc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/tscc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/tscc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/tscc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/tta.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/tta.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/tta.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/tta.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/txd.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/txd.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/txd.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/txd.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ulti.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ulti.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ulti.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ulti.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ulti_cb.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/ulti_cb.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ulti_cb.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ulti_cb.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/unary.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/unary.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/unary.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/unary.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/utils.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/utils.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/utils.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/utils.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vb.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vb.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vb.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vb.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vc1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vc1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vc1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vc1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vc1.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vc1.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vc1.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vc1.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vc1_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vc1_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vc1_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vc1_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vc1acdata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vc1acdata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vc1acdata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vc1acdata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vc1data.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vc1data.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vc1data.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vc1data.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vc1data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vc1data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vc1data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vc1data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vc1dsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vc1dsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vc1dsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vc1dsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vcr1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vcr1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vcr1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vcr1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vdpau.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vdpau.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vdpau.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vdpau.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vdpau.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vdpau.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vdpau.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vdpau.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vdpau_internal.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vdpau_internal.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vdpau_internal.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vdpau_internal.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vmdav.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vmdav.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vmdav.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vmdav.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vmnc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vmnc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vmnc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vmnc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vorbis.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vorbis.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vorbis.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vorbis.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vorbis_data.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_data.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vorbis_data.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_data.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vorbis_dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vorbis_dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vorbis_enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vorbis_enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vorbis_enc_data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_enc_data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vorbis_enc_data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vorbis_enc_data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp3.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp3.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp3.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp3.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp3_parser.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp3_parser.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp3_parser.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp3_parser.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp3data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp3data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp3data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp3data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp3dsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp3dsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp3dsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp3dsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp5.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp5.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp5.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp5.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp56.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp56.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp56.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp56.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp56.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp56.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp56.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp56.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp56data.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp56data.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp56data.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp56data.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp56data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp56data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp56data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp56data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp5data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp5data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp5data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp5data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp6.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp6.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp6.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp6.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp6data.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp6data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp6data.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp6data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vp6dsp.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vp6dsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vp6dsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vp6dsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/vqavideo.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/vqavideo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/vqavideo.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/vqavideo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/w32thread.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/w32thread.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/w32thread.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/w32thread.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wavpack.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wavpack.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wavpack.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wavpack.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wma.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wma.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wma.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wma.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wma.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/wma.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wma.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wma.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wmadata.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/wmadata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wmadata.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wmadata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wmadec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wmadec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wmadec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wmadec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wmaenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wmaenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wmaenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wmaenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wmv2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wmv2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wmv2.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wmv2.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wmv2dec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2dec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wmv2dec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2dec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wmv2enc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2enc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wmv2enc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wmv2enc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/wnv1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/wnv1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/wnv1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/wnv1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/ws-snd1.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/ws-snd1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/ws-snd1.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/ws-snd1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
similarity index 94%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
index 7249eb0276..4d79194d9e 100644
--- a/src/add-ons/media/plugins/avcodec/libavcodec/x86/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec libavcodec x86 ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg libavcodec x86 ;
 
 SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ../.. ] ;
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/cavsdsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/cavsdsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/cavsdsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/cavsdsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/cpuid.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/cpuid.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dnxhd_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dnxhd_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dnxhd_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dnxhd_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_h264_template_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_h264_template_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_h264_template_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_h264_template_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_h264_template_ssse3.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_h264_template_ssse3.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_h264_template_ssse3.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_h264_template_ssse3.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_avg.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_avg.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_avg.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_avg.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_avg_template.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_avg_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_avg_template.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_avg_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_qns.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_qns.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_qns.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_qns.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_qns_template.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_qns_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_qns_template.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_qns_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_rnd.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_rnd.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_rnd.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_rnd.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_rnd_template.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_rnd_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx_rnd_template.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx_rnd_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.nasm b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_yasm.nasm
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.nasm
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_yasm.nasm
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputilenc_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputilenc_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputilenc_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputilenc_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/fdct_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fdct_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/fdct_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fdct_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_3dn.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_3dn.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_3dn.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_3dn.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_3dn2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_3dn2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_3dn2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_3dn2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.nasm b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_mmx.nasm
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.nasm
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_mmx.nasm
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_sse.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_sse.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_sse.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/fft_sse.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/flacdsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/flacdsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/flacdsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/flacdsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.nasm b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264_deblock_sse2.nasm
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.nasm
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264_deblock_sse2.nasm
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_i386.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264_i386.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_i386.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264_i386.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264_idct_sse2.nasm
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264_idct_sse2.nasm
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264dsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/h264dsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_mmx_xvid.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_mmx_xvid.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_mmx_xvid.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_mmx_xvid.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_sse2_xvid.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_sse2_xvid.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_sse2_xvid.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_sse2_xvid.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_xvid.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_xvid.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/idct_xvid.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/idct_xvid.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/mathops.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mathops.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/mathops.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mathops.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/mmx.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mmx.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/mmx.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mmx.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/motion_est_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/motion_est_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/motion_est_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/motion_est_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/mpegvideo_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mpegvideo_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/mpegvideo_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mpegvideo_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/mpegvideo_mmx_template.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mpegvideo_mmx_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/mpegvideo_mmx_template.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/mpegvideo_mmx_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/rv40dsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/rv40dsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/rv40dsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/rv40dsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/simple_idct_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/simple_idct_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/simple_idct_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/simple_idct_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/snowdsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/snowdsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/snowdsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/snowdsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vc1dsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vc1dsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vc1dsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vc1dsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_mmx.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_mmx.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_mmx.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_mmx.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_sse2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_sse2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_sse2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_sse2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_sse2.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_sse2.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp3dsp_sse2.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp3dsp_sse2.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_mmx.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_mmx.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_mmx.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_mmx.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_mmx.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_mmx.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_mmx.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_sse2.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_sse2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_sse2.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_sse2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_sse2.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_sse2.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/vp6dsp_sse2.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/vp6dsp_sse2.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/x86inc.asm
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/x86inc.asm
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86util.asm b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/x86util.asm
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/x86/x86util.asm
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/x86/x86util.asm
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/xan.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/xan.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/xan.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/xan.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/xiph.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/xiph.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/xiph.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/xiph.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/xiph.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/xiph.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/xiph.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/xiph.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/xl.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/xl.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/xl.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/xl.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/xsubdec.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/xsubdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/xsubdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/xsubdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/xvmc.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/xvmc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/xvmc.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/xvmc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/xvmc_internal.h b/src/add-ons/media/plugins/ffmpeg/libavcodec/xvmc_internal.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/xvmc_internal.h
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/xvmc_internal.h
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/zmbv.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/zmbv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/zmbv.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/zmbv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/zmbvenc.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/zmbvenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavcodec/zmbvenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavcodec/zmbvenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/4xm.c b/src/add-ons/media/plugins/ffmpeg/libavformat/4xm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/4xm.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/4xm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile
similarity index 97%
rename from src/add-ons/media/plugins/avcodec/libavformat/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile
index 066de9da03..e58e203697 100644
--- a/src/add-ons/media/plugins/avcodec/libavformat/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec libavformat ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg libavformat ;
 
 SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ../libavutil ] ;
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/Makefile b/src/add-ons/media/plugins/ffmpeg/libavformat/Makefile
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/Makefile
rename to src/add-ons/media/plugins/ffmpeg/libavformat/Makefile
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/adtsenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/adtsenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/adtsenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/adtsenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/aiff.c b/src/add-ons/media/plugins/ffmpeg/libavformat/aiff.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/aiff.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/aiff.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/allformats.c b/src/add-ons/media/plugins/ffmpeg/libavformat/allformats.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/allformats.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/allformats.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/amr.c b/src/add-ons/media/plugins/ffmpeg/libavformat/amr.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/amr.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/amr.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/apc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/apc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/apc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/apc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/ape.c b/src/add-ons/media/plugins/ffmpeg/libavformat/ape.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/ape.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/ape.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/asf.c b/src/add-ons/media/plugins/ffmpeg/libavformat/asf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/asf.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/asf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/asf.h b/src/add-ons/media/plugins/ffmpeg/libavformat/asf.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/asf.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/asf.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/asfcrypt.c b/src/add-ons/media/plugins/ffmpeg/libavformat/asfcrypt.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/asfcrypt.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/asfcrypt.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/asfcrypt.h b/src/add-ons/media/plugins/ffmpeg/libavformat/asfcrypt.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/asfcrypt.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/asfcrypt.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/asfdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/asfdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/asfdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/asfdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/asfenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/asfenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/asfenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/asfenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/assdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/assdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/assdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/assdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/assenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/assenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/assenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/assenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/au.c b/src/add-ons/media/plugins/ffmpeg/libavformat/au.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/au.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/au.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/audiointerleave.c b/src/add-ons/media/plugins/ffmpeg/libavformat/audiointerleave.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/audiointerleave.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/audiointerleave.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/audiointerleave.h b/src/add-ons/media/plugins/ffmpeg/libavformat/audiointerleave.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/audiointerleave.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/audiointerleave.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/avc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avc.h b/src/add-ons/media/plugins/ffmpeg/libavformat/avc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avc.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avformat.h b/src/add-ons/media/plugins/ffmpeg/libavformat/avformat.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avformat.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avformat.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avi.h b/src/add-ons/media/plugins/ffmpeg/libavformat/avi.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avi.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avi.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avidec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/avidec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avidec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avidec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avienc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/avienc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avienc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avienc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avio.c b/src/add-ons/media/plugins/ffmpeg/libavformat/avio.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avio.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avio.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avio.h b/src/add-ons/media/plugins/ffmpeg/libavformat/avio.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avio.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avio.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/aviobuf.c b/src/add-ons/media/plugins/ffmpeg/libavformat/aviobuf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/aviobuf.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/aviobuf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avisynth.c b/src/add-ons/media/plugins/ffmpeg/libavformat/avisynth.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avisynth.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avisynth.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/avs.c b/src/add-ons/media/plugins/ffmpeg/libavformat/avs.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/avs.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/avs.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/bethsoftvid.c b/src/add-ons/media/plugins/ffmpeg/libavformat/bethsoftvid.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/bethsoftvid.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/bethsoftvid.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/bfi.c b/src/add-ons/media/plugins/ffmpeg/libavformat/bfi.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/bfi.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/bfi.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/c93.c b/src/add-ons/media/plugins/ffmpeg/libavformat/c93.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/c93.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/c93.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/crcenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/crcenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/crcenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/crcenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/cutils.c b/src/add-ons/media/plugins/ffmpeg/libavformat/cutils.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/cutils.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/cutils.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/daud.c b/src/add-ons/media/plugins/ffmpeg/libavformat/daud.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/daud.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/daud.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/dsicin.c b/src/add-ons/media/plugins/ffmpeg/libavformat/dsicin.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/dsicin.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/dsicin.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/dv.c b/src/add-ons/media/plugins/ffmpeg/libavformat/dv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/dv.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/dv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/dv.h b/src/add-ons/media/plugins/ffmpeg/libavformat/dv.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/dv.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/dv.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/dvenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/dvenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/dvenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/dvenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/dxa.c b/src/add-ons/media/plugins/ffmpeg/libavformat/dxa.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/dxa.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/dxa.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/eacdata.c b/src/add-ons/media/plugins/ffmpeg/libavformat/eacdata.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/eacdata.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/eacdata.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/electronicarts.c b/src/add-ons/media/plugins/ffmpeg/libavformat/electronicarts.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/electronicarts.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/electronicarts.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/ffm.h b/src/add-ons/media/plugins/ffmpeg/libavformat/ffm.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/ffm.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/ffm.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/ffmdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/ffmdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/ffmdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/ffmdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/ffmenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/ffmenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/ffmenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/ffmenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/file.c b/src/add-ons/media/plugins/ffmpeg/libavformat/file.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/file.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/file.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/flacdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/flacdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/flacdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/flacdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/flacenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/flacenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/flacenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/flacenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/flacenc.h b/src/add-ons/media/plugins/ffmpeg/libavformat/flacenc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/flacenc.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/flacenc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/flic.c b/src/add-ons/media/plugins/ffmpeg/libavformat/flic.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/flic.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/flic.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/flv.h b/src/add-ons/media/plugins/ffmpeg/libavformat/flv.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/flv.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/flv.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/flvdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/flvdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/flvdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/flvdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/flvenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/flvenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/flvenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/flvenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/framecrcenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/framecrcenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/framecrcenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/framecrcenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/framehook.c b/src/add-ons/media/plugins/ffmpeg/libavformat/framehook.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/framehook.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/framehook.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/framehook.h b/src/add-ons/media/plugins/ffmpeg/libavformat/framehook.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/framehook.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/framehook.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/gif.c b/src/add-ons/media/plugins/ffmpeg/libavformat/gif.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/gif.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/gif.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/gopher.c b/src/add-ons/media/plugins/ffmpeg/libavformat/gopher.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/gopher.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/gopher.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/gxf.c b/src/add-ons/media/plugins/ffmpeg/libavformat/gxf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/gxf.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/gxf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/gxf.h b/src/add-ons/media/plugins/ffmpeg/libavformat/gxf.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/gxf.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/gxf.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/gxfenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/gxfenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/gxfenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/gxfenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/http.c b/src/add-ons/media/plugins/ffmpeg/libavformat/http.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/http.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/http.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/id3v2.c b/src/add-ons/media/plugins/ffmpeg/libavformat/id3v2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/id3v2.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/id3v2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/id3v2.h b/src/add-ons/media/plugins/ffmpeg/libavformat/id3v2.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/id3v2.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/id3v2.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/idcin.c b/src/add-ons/media/plugins/ffmpeg/libavformat/idcin.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/idcin.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/idcin.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/idroq.c b/src/add-ons/media/plugins/ffmpeg/libavformat/idroq.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/idroq.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/idroq.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/iff.c b/src/add-ons/media/plugins/ffmpeg/libavformat/iff.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/iff.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/iff.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/img2.c b/src/add-ons/media/plugins/ffmpeg/libavformat/img2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/img2.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/img2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/internal.h b/src/add-ons/media/plugins/ffmpeg/libavformat/internal.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/internal.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/internal.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/ipmovie.c b/src/add-ons/media/plugins/ffmpeg/libavformat/ipmovie.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/ipmovie.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/ipmovie.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/isom.c b/src/add-ons/media/plugins/ffmpeg/libavformat/isom.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/isom.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/isom.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/isom.h b/src/add-ons/media/plugins/ffmpeg/libavformat/isom.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/isom.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/isom.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/iss.c b/src/add-ons/media/plugins/ffmpeg/libavformat/iss.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/iss.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/iss.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/libnut.c b/src/add-ons/media/plugins/ffmpeg/libavformat/libnut.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/libnut.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/libnut.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/lmlm4.c b/src/add-ons/media/plugins/ffmpeg/libavformat/lmlm4.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/lmlm4.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/lmlm4.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/matroska.c b/src/add-ons/media/plugins/ffmpeg/libavformat/matroska.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/matroska.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/matroska.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/matroska.h b/src/add-ons/media/plugins/ffmpeg/libavformat/matroska.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/matroska.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/matroska.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/matroskadec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/matroskadec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/matroskadec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/matroskadec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/matroskaenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/matroskaenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/matroskaenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/matroskaenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/metadata.c b/src/add-ons/media/plugins/ffmpeg/libavformat/metadata.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/metadata.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/metadata.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/metadata.h b/src/add-ons/media/plugins/ffmpeg/libavformat/metadata.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/metadata.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/metadata.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/metadata_compat.c b/src/add-ons/media/plugins/ffmpeg/libavformat/metadata_compat.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/metadata_compat.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/metadata_compat.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mm.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mm.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mmf.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mmf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mmf.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mmf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mov.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mov.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mov.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mov.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/movenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/movenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/movenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/movenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mp3.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mp3.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mp3.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mp3.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mpc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpc8.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mpc8.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpc8.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpc8.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpeg.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mpeg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpeg.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpeg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpeg.h b/src/add-ons/media/plugins/ffmpeg/libavformat/mpeg.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpeg.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpeg.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpegenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mpegenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpegenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpegenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpegts.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mpegts.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpegts.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpegts.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpegts.h b/src/add-ons/media/plugins/ffmpeg/libavformat/mpegts.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpegts.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpegts.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpegtsenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mpegtsenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpegtsenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpegtsenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mpjpeg.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mpjpeg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mpjpeg.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mpjpeg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/msnwc_tcp.c b/src/add-ons/media/plugins/ffmpeg/libavformat/msnwc_tcp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/msnwc_tcp.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/msnwc_tcp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mtv.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mtv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mtv.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mtv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mvi.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mvi.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mvi.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mvi.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mxf.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mxf.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mxf.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mxf.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mxf.h b/src/add-ons/media/plugins/ffmpeg/libavformat/mxf.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mxf.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mxf.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mxfdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mxfdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mxfdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mxfdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/mxfenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/mxfenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/mxfenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/mxfenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/ncdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/ncdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/ncdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/ncdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/network.h b/src/add-ons/media/plugins/ffmpeg/libavformat/network.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/network.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/network.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/nsvdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/nsvdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/nsvdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/nsvdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/nut.c b/src/add-ons/media/plugins/ffmpeg/libavformat/nut.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/nut.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/nut.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/nut.h b/src/add-ons/media/plugins/ffmpeg/libavformat/nut.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/nut.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/nut.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/nutdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/nutdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/nutdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/nutdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/nutenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/nutenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/nutenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/nutenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/nuv.c b/src/add-ons/media/plugins/ffmpeg/libavformat/nuv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/nuv.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/nuv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oggdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggdec.h b/src/add-ons/media/plugins/ffmpeg/libavformat/oggdec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggdec.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggdec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oggenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggparseflac.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oggparseflac.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggparseflac.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggparseflac.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggparseogm.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oggparseogm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggparseogm.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggparseogm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggparsespeex.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oggparsespeex.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggparsespeex.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggparsespeex.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggparsetheora.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oggparsetheora.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggparsetheora.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggparsetheora.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oggparsevorbis.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oggparsevorbis.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oggparsevorbis.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oggparsevorbis.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/oma.c b/src/add-ons/media/plugins/ffmpeg/libavformat/oma.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/oma.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/oma.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/options.c b/src/add-ons/media/plugins/ffmpeg/libavformat/options.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/options.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/options.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/os_support.c b/src/add-ons/media/plugins/ffmpeg/libavformat/os_support.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/os_support.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/os_support.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/os_support.h b/src/add-ons/media/plugins/ffmpeg/libavformat/os_support.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/os_support.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/os_support.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/psxstr.c b/src/add-ons/media/plugins/ffmpeg/libavformat/psxstr.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/psxstr.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/psxstr.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/pva.c b/src/add-ons/media/plugins/ffmpeg/libavformat/pva.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/pva.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/pva.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/qtpalette.h b/src/add-ons/media/plugins/ffmpeg/libavformat/qtpalette.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/qtpalette.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/qtpalette.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/r3d.c b/src/add-ons/media/plugins/ffmpeg/libavformat/r3d.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/r3d.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/r3d.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/raw.c b/src/add-ons/media/plugins/ffmpeg/libavformat/raw.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/raw.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/raw.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/raw.h b/src/add-ons/media/plugins/ffmpeg/libavformat/raw.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/raw.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/raw.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rdt.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rdt.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rdt.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rdt.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rdt.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rdt.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rdt.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rdt.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/riff.c b/src/add-ons/media/plugins/ffmpeg/libavformat/riff.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/riff.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/riff.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/riff.h b/src/add-ons/media/plugins/ffmpeg/libavformat/riff.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/riff.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/riff.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rl2.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rl2.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rl2.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rl2.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rm.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rm.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rm.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rm.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rm.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rm.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rmdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rmdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rmdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rmdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rmenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rmenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rmenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rmenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rpl.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rpl.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rpl.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rpl.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtp.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtp.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtp.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rtp.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtp.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtp.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtp_aac.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtp_aac.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtp_aac.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtp_aac.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtp_h264.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtp_h264.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtp_h264.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtp_h264.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtp_h264.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rtp_h264.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtp_h264.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtp_h264.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtp_mpv.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtp_mpv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtp_mpv.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtp_mpv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtpdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtpdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtpdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtpdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtpdec.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rtpdec.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtpdec.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtpdec.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtpenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtpenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtpenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtpenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtpenc.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rtpenc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtpenc.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtpenc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtpenc_h264.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtpenc_h264.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtpenc_h264.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtpenc_h264.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtpproto.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtpproto.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtpproto.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtpproto.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtsp.c b/src/add-ons/media/plugins/ffmpeg/libavformat/rtsp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtsp.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtsp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtsp.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rtsp.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtsp.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtsp.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/rtspcodes.h b/src/add-ons/media/plugins/ffmpeg/libavformat/rtspcodes.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/rtspcodes.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/rtspcodes.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/sdp.c b/src/add-ons/media/plugins/ffmpeg/libavformat/sdp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/sdp.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/sdp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/segafilm.c b/src/add-ons/media/plugins/ffmpeg/libavformat/segafilm.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/segafilm.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/segafilm.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/sierravmd.c b/src/add-ons/media/plugins/ffmpeg/libavformat/sierravmd.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/sierravmd.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/sierravmd.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/siff.c b/src/add-ons/media/plugins/ffmpeg/libavformat/siff.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/siff.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/siff.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/smacker.c b/src/add-ons/media/plugins/ffmpeg/libavformat/smacker.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/smacker.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/smacker.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/sol.c b/src/add-ons/media/plugins/ffmpeg/libavformat/sol.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/sol.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/sol.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/swf.h b/src/add-ons/media/plugins/ffmpeg/libavformat/swf.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/swf.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/swf.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/swfdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/swfdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/swfdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/swfdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/swfenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/swfenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/swfenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/swfenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/tcp.c b/src/add-ons/media/plugins/ffmpeg/libavformat/tcp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/tcp.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/tcp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/thp.c b/src/add-ons/media/plugins/ffmpeg/libavformat/thp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/thp.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/thp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/tiertexseq.c b/src/add-ons/media/plugins/ffmpeg/libavformat/tiertexseq.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/tiertexseq.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/tiertexseq.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/tta.c b/src/add-ons/media/plugins/ffmpeg/libavformat/tta.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/tta.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/tta.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/txd.c b/src/add-ons/media/plugins/ffmpeg/libavformat/txd.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/txd.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/txd.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/udp.c b/src/add-ons/media/plugins/ffmpeg/libavformat/udp.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/udp.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/udp.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/utils.c b/src/add-ons/media/plugins/ffmpeg/libavformat/utils.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/utils.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/utils.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/vc1test.c b/src/add-ons/media/plugins/ffmpeg/libavformat/vc1test.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/vc1test.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/vc1test.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/vc1testenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/vc1testenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/vc1testenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/vc1testenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/voc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/voc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/voc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/voc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/voc.h b/src/add-ons/media/plugins/ffmpeg/libavformat/voc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/voc.h
rename to src/add-ons/media/plugins/ffmpeg/libavformat/voc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/vocdec.c b/src/add-ons/media/plugins/ffmpeg/libavformat/vocdec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/vocdec.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/vocdec.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/vocenc.c b/src/add-ons/media/plugins/ffmpeg/libavformat/vocenc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/vocenc.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/vocenc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/wav.c b/src/add-ons/media/plugins/ffmpeg/libavformat/wav.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/wav.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/wav.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/wc3movie.c b/src/add-ons/media/plugins/ffmpeg/libavformat/wc3movie.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/wc3movie.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/wc3movie.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/westwood.c b/src/add-ons/media/plugins/ffmpeg/libavformat/westwood.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/westwood.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/westwood.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/wv.c b/src/add-ons/media/plugins/ffmpeg/libavformat/wv.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/wv.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/wv.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/xa.c b/src/add-ons/media/plugins/ffmpeg/libavformat/xa.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/xa.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/xa.c
diff --git a/src/add-ons/media/plugins/avcodec/libavformat/yuv4mpeg.c b/src/add-ons/media/plugins/ffmpeg/libavformat/yuv4mpeg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavformat/yuv4mpeg.c
rename to src/add-ons/media/plugins/ffmpeg/libavformat/yuv4mpeg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavutil/Jamfile
similarity index 90%
rename from src/add-ons/media/plugins/avcodec/libavutil/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/libavutil/Jamfile
index 926d6955dd..2ad5d37844 100644
--- a/src/add-ons/media/plugins/avcodec/libavutil/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavutil/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec libavutil ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg libavutil ;
 
 # filter warnings we don't want here
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/adler32.c b/src/add-ons/media/plugins/ffmpeg/libavutil/adler32.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/adler32.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/adler32.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/adler32.h b/src/add-ons/media/plugins/ffmpeg/libavutil/adler32.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/adler32.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/adler32.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/aes.c b/src/add-ons/media/plugins/ffmpeg/libavutil/aes.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/aes.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/aes.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/aes.h b/src/add-ons/media/plugins/ffmpeg/libavutil/aes.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/aes.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/aes.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/avstring.c b/src/add-ons/media/plugins/ffmpeg/libavutil/avstring.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/avstring.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/avstring.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/avstring.h b/src/add-ons/media/plugins/ffmpeg/libavutil/avstring.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/avstring.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/avstring.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/avutil.h b/src/add-ons/media/plugins/ffmpeg/libavutil/avutil.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/avutil.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/avutil.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/base64.c b/src/add-ons/media/plugins/ffmpeg/libavutil/base64.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/base64.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/base64.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/base64.h b/src/add-ons/media/plugins/ffmpeg/libavutil/base64.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/base64.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/base64.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/bswap.h b/src/add-ons/media/plugins/ffmpeg/libavutil/bswap.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/bswap.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/bswap.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/common.h b/src/add-ons/media/plugins/ffmpeg/libavutil/common.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/common.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/common.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/crc.c b/src/add-ons/media/plugins/ffmpeg/libavutil/crc.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/crc.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/crc.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/crc.h b/src/add-ons/media/plugins/ffmpeg/libavutil/crc.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/crc.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/crc.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/crc_data.h b/src/add-ons/media/plugins/ffmpeg/libavutil/crc_data.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/crc_data.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/crc_data.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/des.c b/src/add-ons/media/plugins/ffmpeg/libavutil/des.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/des.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/des.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/des.h b/src/add-ons/media/plugins/ffmpeg/libavutil/des.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/des.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/des.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/fifo.c b/src/add-ons/media/plugins/ffmpeg/libavutil/fifo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/fifo.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/fifo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/fifo.h b/src/add-ons/media/plugins/ffmpeg/libavutil/fifo.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/fifo.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/fifo.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/integer.c b/src/add-ons/media/plugins/ffmpeg/libavutil/integer.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/integer.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/integer.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/integer.h b/src/add-ons/media/plugins/ffmpeg/libavutil/integer.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/integer.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/integer.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/internal.h b/src/add-ons/media/plugins/ffmpeg/libavutil/internal.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/internal.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/internal.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/intfloat_readwrite.c b/src/add-ons/media/plugins/ffmpeg/libavutil/intfloat_readwrite.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/intfloat_readwrite.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/intfloat_readwrite.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/intfloat_readwrite.h b/src/add-ons/media/plugins/ffmpeg/libavutil/intfloat_readwrite.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/intfloat_readwrite.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/intfloat_readwrite.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/intreadwrite.h b/src/add-ons/media/plugins/ffmpeg/libavutil/intreadwrite.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/intreadwrite.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/intreadwrite.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/lfg.c b/src/add-ons/media/plugins/ffmpeg/libavutil/lfg.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/lfg.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/lfg.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/lfg.h b/src/add-ons/media/plugins/ffmpeg/libavutil/lfg.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/lfg.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/lfg.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/lls.c b/src/add-ons/media/plugins/ffmpeg/libavutil/lls.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/lls.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/lls.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/lls.h b/src/add-ons/media/plugins/ffmpeg/libavutil/lls.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/lls.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/lls.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/log.c b/src/add-ons/media/plugins/ffmpeg/libavutil/log.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/log.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/log.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/log.h b/src/add-ons/media/plugins/ffmpeg/libavutil/log.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/log.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/log.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/lzo.c b/src/add-ons/media/plugins/ffmpeg/libavutil/lzo.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/lzo.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/lzo.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/lzo.h b/src/add-ons/media/plugins/ffmpeg/libavutil/lzo.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/lzo.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/lzo.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/mathematics.c b/src/add-ons/media/plugins/ffmpeg/libavutil/mathematics.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/mathematics.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/mathematics.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/mathematics.h b/src/add-ons/media/plugins/ffmpeg/libavutil/mathematics.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/mathematics.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/mathematics.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/md5.c b/src/add-ons/media/plugins/ffmpeg/libavutil/md5.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/md5.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/md5.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/md5.h b/src/add-ons/media/plugins/ffmpeg/libavutil/md5.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/md5.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/md5.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/mem.c b/src/add-ons/media/plugins/ffmpeg/libavutil/mem.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/mem.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/mem.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/mem.h b/src/add-ons/media/plugins/ffmpeg/libavutil/mem.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/mem.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/mem.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/pca.c b/src/add-ons/media/plugins/ffmpeg/libavutil/pca.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/pca.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/pca.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/pca.h b/src/add-ons/media/plugins/ffmpeg/libavutil/pca.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/pca.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/pca.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/pixfmt.h b/src/add-ons/media/plugins/ffmpeg/libavutil/pixfmt.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/pixfmt.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/pixfmt.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/random.c b/src/add-ons/media/plugins/ffmpeg/libavutil/random.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/random.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/random.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/random.h b/src/add-ons/media/plugins/ffmpeg/libavutil/random.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/random.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/random.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/random_seed.c b/src/add-ons/media/plugins/ffmpeg/libavutil/random_seed.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/random_seed.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/random_seed.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/random_seed.h b/src/add-ons/media/plugins/ffmpeg/libavutil/random_seed.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/random_seed.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/random_seed.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/rational.c b/src/add-ons/media/plugins/ffmpeg/libavutil/rational.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/rational.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/rational.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/rational.h b/src/add-ons/media/plugins/ffmpeg/libavutil/rational.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/rational.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/rational.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/rc4.c b/src/add-ons/media/plugins/ffmpeg/libavutil/rc4.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/rc4.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/rc4.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/rc4.h b/src/add-ons/media/plugins/ffmpeg/libavutil/rc4.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/rc4.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/rc4.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/sha1.c b/src/add-ons/media/plugins/ffmpeg/libavutil/sha1.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/sha1.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/sha1.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/sha1.h b/src/add-ons/media/plugins/ffmpeg/libavutil/sha1.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/sha1.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/sha1.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/softfloat.h b/src/add-ons/media/plugins/ffmpeg/libavutil/softfloat.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/softfloat.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/softfloat.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/string.c b/src/add-ons/media/plugins/ffmpeg/libavutil/string.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/string.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/string.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/timer.h b/src/add-ons/media/plugins/ffmpeg/libavutil/timer.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/timer.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/timer.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/tree.c b/src/add-ons/media/plugins/ffmpeg/libavutil/tree.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/tree.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/tree.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/tree.h b/src/add-ons/media/plugins/ffmpeg/libavutil/tree.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/tree.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/tree.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/utils.c b/src/add-ons/media/plugins/ffmpeg/libavutil/utils.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/utils.c
rename to src/add-ons/media/plugins/ffmpeg/libavutil/utils.c
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/x86/bswap.h b/src/add-ons/media/plugins/ffmpeg/libavutil/x86/bswap.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/x86/bswap.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/x86/bswap.h
diff --git a/src/add-ons/media/plugins/avcodec/libavutil/x86_cpu.h b/src/add-ons/media/plugins/ffmpeg/libavutil/x86_cpu.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libavutil/x86_cpu.h
rename to src/add-ons/media/plugins/ffmpeg/libavutil/x86_cpu.h
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/Jamfile b/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile
similarity index 96%
rename from src/add-ons/media/plugins/avcodec/libswscale/Jamfile
rename to src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile
index 83139ea67d..8e2d293a66 100644
--- a/src/add-ons/media/plugins/avcodec/libswscale/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins avcodec libswscale ;
+SubDir HAIKU_TOP src add-ons media plugins ffmpeg libswscale ;
 
 SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ../libavutil ] ;
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/internal_bfin.S b/src/add-ons/media/plugins/ffmpeg/libswscale/internal_bfin.S
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/internal_bfin.S
rename to src/add-ons/media/plugins/ffmpeg/libswscale/internal_bfin.S
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/rgb2rgb.c b/src/add-ons/media/plugins/ffmpeg/libswscale/rgb2rgb.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/rgb2rgb.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/rgb2rgb.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/rgb2rgb.h b/src/add-ons/media/plugins/ffmpeg/libswscale/rgb2rgb.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/rgb2rgb.h
rename to src/add-ons/media/plugins/ffmpeg/libswscale/rgb2rgb.h
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/rgb2rgb_template.c b/src/add-ons/media/plugins/ffmpeg/libswscale/rgb2rgb_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/rgb2rgb_template.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/rgb2rgb_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/swscale.c b/src/add-ons/media/plugins/ffmpeg/libswscale/swscale.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/swscale.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/swscale.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/swscale.h b/src/add-ons/media/plugins/ffmpeg/libswscale/swscale.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/swscale.h
rename to src/add-ons/media/plugins/ffmpeg/libswscale/swscale.h
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/swscale_altivec_template.c b/src/add-ons/media/plugins/ffmpeg/libswscale/swscale_altivec_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/swscale_altivec_template.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/swscale_altivec_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/swscale_avoption.c b/src/add-ons/media/plugins/ffmpeg/libswscale/swscale_avoption.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/swscale_avoption.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/swscale_avoption.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/swscale_bfin.c b/src/add-ons/media/plugins/ffmpeg/libswscale/swscale_bfin.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/swscale_bfin.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/swscale_bfin.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/swscale_internal.h b/src/add-ons/media/plugins/ffmpeg/libswscale/swscale_internal.h
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/swscale_internal.h
rename to src/add-ons/media/plugins/ffmpeg/libswscale/swscale_internal.h
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/swscale_template.c b/src/add-ons/media/plugins/ffmpeg/libswscale/swscale_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/swscale_template.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/swscale_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb.c b/src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_altivec.c b/src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_altivec.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_altivec.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_altivec.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_bfin.c b/src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_bfin.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_bfin.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_bfin.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_mlib.c b/src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_mlib.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_mlib.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_mlib.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_template.c b/src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_template.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_template.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_template.c
diff --git a/src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_vis.c b/src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_vis.c
similarity index 100%
rename from src/add-ons/media/plugins/avcodec/libswscale/yuv2rgb_vis.c
rename to src/add-ons/media/plugins/ffmpeg/libswscale/yuv2rgb_vis.c