* Renamed avcodec folder to ffmpeg.

* Cleaned up plugins Jamfile.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31359 a95241bf-73f2-0310-859d-f6bbb57e9c96

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

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 ;

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) ;