diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 4c2c23346..2cf9e577b 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -148,7 +148,7 @@ 8359009D17FF06570060F3ED /* ArchiveSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8359FF3117FEF35D0060F3ED /* ArchiveSource.bundle */; }; 8360EF6D17F92E56005208A4 /* HighlyComplete.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8360EF0517F92B24005208A4 /* HighlyComplete.bundle */; }; 8375B36517FFEF130092A79F /* Opus.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8375B05717FFEA410092A79F /* Opus.bundle */; }; - 83BCB8DE17FC971300760340 /* WMA.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94350D747F7B0064F138 /* WMA.bundle */; }; + 83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94350D747F7B0064F138 /* FFMPEG.bundle */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -455,10 +455,10 @@ }; 83BCB8DC17FC96FC00760340 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B09E94300D747F7B0064F138 /* WMA.xcodeproj */; + containerPortal = B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */; proxyType = 1; remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = "WMA Plugin"; + remoteInfo = "FFMPEG Plugin"; }; 8E8D40860CBB036600135C1B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -490,10 +490,10 @@ }; B09E94340D747F7B0064F138 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B09E94300D747F7B0064F138 /* WMA.xcodeproj */; + containerPortal = B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */; proxyType = 2; remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = WMA; + remoteInfo = FFMPEG; }; /* End PBXContainerItemProxy section */ @@ -515,7 +515,7 @@ files = ( 8375B36517FFEF130092A79F /* Opus.bundle in CopyFiles */, 8359009D17FF06570060F3ED /* ArchiveSource.bundle in CopyFiles */, - 83BCB8DE17FC971300760340 /* WMA.bundle in CopyFiles */, + 83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */, 8360EF6D17F92E56005208A4 /* HighlyComplete.bundle in CopyFiles */, 99EAACA80DD1BB7A00423C38 /* APL.bundle in CopyFiles */, 17C8F7D80CBEF3EF008D969D /* Dumb.bundle in CopyFiles */, @@ -792,7 +792,7 @@ 8E8D41C20CBB0DA000135C1B /* Pls.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pls.xcodeproj; path = Plugins/Pls/Pls.xcodeproj; sourceTree = ""; }; 8E9A30130BA792DC0091081B /* NSFileHandle+CreateFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFileHandle+CreateFile.h"; sourceTree = ""; }; 8E9A30140BA792DC0091081B /* NSFileHandle+CreateFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileHandle+CreateFile.m"; sourceTree = ""; }; - B09E94300D747F7B0064F138 /* WMA.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WMA.xcodeproj; path = Plugins/WMA/WMA.xcodeproj; sourceTree = ""; }; + B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FFMPEG.xcodeproj; path = Plugins/FFMPEG/FFMPEG.xcodeproj; sourceTree = ""; }; B09E96620D74A7BC0064F138 /* stop_current.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_current.png; path = Images/stop_current.png; sourceTree = ""; }; F6F96718102C709000D2C9B4 /* NSString+FinderCompare.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+FinderCompare.m"; sourceTree = ""; }; F6F9671A102C70C800D2C9B4 /* NSString+FinderCompare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+FinderCompare.h"; sourceTree = ""; }; @@ -1029,7 +1029,7 @@ isa = PBXGroup; children = ( 8360EF0017F92B23005208A4 /* HighlyComplete.xcodeproj */, - B09E94300D747F7B0064F138 /* WMA.xcodeproj */, + B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */, 566D32160D538550004466A5 /* APL.xcodeproj */, 17C8F7D20CBEF3E8008D969D /* Dumb.xcodeproj */, 17C8F3C80CBED663008D969D /* GME.xcodeproj */, @@ -1504,7 +1504,7 @@ B09E94310D747F7B0064F138 /* Products */ = { isa = PBXGroup; children = ( - B09E94350D747F7B0064F138 /* WMA.bundle */, + B09E94350D747F7B0064F138 /* FFMPEG.bundle */, ); name = Products; sourceTree = ""; @@ -1671,7 +1671,7 @@ }, { ProductGroup = B09E94310D747F7B0064F138 /* Products */; - ProjectRef = B09E94300D747F7B0064F138 /* WMA.xcodeproj */; + ProjectRef = B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */; }, ); projectRoot = ""; @@ -1836,10 +1836,10 @@ remoteRef = 8E8D41C60CBB0DA000135C1B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - B09E94350D747F7B0064F138 /* WMA.bundle */ = { + B09E94350D747F7B0064F138 /* FFMPEG.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = WMA.bundle; + path = FFMPEG.bundle; remoteRef = B09E94340D747F7B0064F138 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2100,7 +2100,7 @@ }; 83BCB8DD17FC96FC00760340 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "WMA Plugin"; + name = "FFMPEG Plugin"; targetProxy = 83BCB8DC17FC96FC00760340 /* PBXContainerItemProxy */; }; 8E8D40930CBB03AF00135C1B /* PBXTargetDependency */ = { @@ -2217,7 +2217,7 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/build/Release/WMA.framework\"", + "\"$(SRCROOT)/build/Release/FFMPEG.framework\"", "\"$(SRCROOT)/ID3/libid3\"", ); OTHER_CFLAGS = ( @@ -2251,7 +2251,7 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/build/Release/WMA.framework\"", + "\"$(SRCROOT)/build/Release/FFMPEG.framework\"", "\"$(SRCROOT)/ID3/libid3\"", ); OTHER_CFLAGS = ( diff --git a/Frameworks/WMA/English.lproj/InfoPlist.strings b/Frameworks/FFMPEG/English.lproj/InfoPlist.strings similarity index 100% rename from Frameworks/WMA/English.lproj/InfoPlist.strings rename to Frameworks/FFMPEG/English.lproj/InfoPlist.strings diff --git a/Frameworks/WMA/WMA.xcodeproj/project.pbxproj b/Frameworks/FFMPEG/FFMPEG.xcodeproj/project.pbxproj similarity index 98% rename from Frameworks/WMA/WMA.xcodeproj/project.pbxproj rename to Frameworks/FFMPEG/FFMPEG.xcodeproj/project.pbxproj index 3c6ae353a..c688cfc3b 100644 --- a/Frameworks/WMA/WMA.xcodeproj/project.pbxproj +++ b/Frameworks/FFMPEG/FFMPEG.xcodeproj/project.pbxproj @@ -281,7 +281,7 @@ /* Begin PBXFileReference section */ 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 32DBCF5E0370ADEE00C91783 /* WMA_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMA_Prefix.pch; sourceTree = ""; }; + 32DBCF5E0370ADEE00C91783 /* FFMPEG_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFMPEG_Prefix.pch; sourceTree = ""; }; 830F0B8F17FC4FB900042E8F /* allcodecs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = allcodecs.c; sourceTree = ""; }; 830F0B9017FC4FB900042E8F /* avcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avcodec.h; sourceTree = ""; }; 830F0B9317FC4FB900042E8F /* fft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fft.c; sourceTree = ""; }; @@ -552,7 +552,7 @@ 83BCB8E017FCA64400760340 /* timecode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = timecode.c; sourceTree = ""; }; 83BCB8E117FCA64400760340 /* timecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timecode.h; sourceTree = ""; }; 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DC2EF5B0486A6940098B216 /* WMA.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WMA.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DC2EF5B0486A6940098B216 /* FFMPEG.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FFMPEG.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B09E94730D74834B0064F138 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; B09E94EF0D748DEE0064F138 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = ""; }; /* End PBXFileReference section */ @@ -573,23 +573,23 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( - 8DC2EF5B0486A6940098B216 /* WMA.framework */, + 8DC2EF5B0486A6940098B216 /* FFMPEG.framework */, ); name = Products; sourceTree = ""; }; - 0867D691FE84028FC02AAC07 /* WMA */ = { + 0867D691FE84028FC02AAC07 /* FFMPEG */ = { isa = PBXGroup; children = ( 830F0C5E17FC7D3100042E8F /* libz.dylib */, B09E94EF0D748DEE0064F138 /* libiconv.dylib */, - B09E94660D74834B0064F138 /* ffmpeg-strip-wma */, + B09E94660D74834B0064F138 /* ffmpeg-minimal */, 32C88DFF0371C24200C91783 /* Other Sources */, 089C1665FE841158C02AAC07 /* Resources */, 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, 034768DFFF38A50411DB9C8B /* Products */, ); - name = WMA; + name = FFMPEG; sourceTree = ""; }; 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { @@ -627,7 +627,7 @@ 32C88DFF0371C24200C91783 /* Other Sources */ = { isa = PBXGroup; children = ( - 32DBCF5E0370ADEE00C91783 /* WMA_Prefix.pch */, + 32DBCF5E0370ADEE00C91783 /* FFMPEG_Prefix.pch */, ); name = "Other Sources"; sourceTree = ""; @@ -961,7 +961,7 @@ path = x86; sourceTree = ""; }; - B09E94660D74834B0064F138 /* ffmpeg-strip-wma */ = { + B09E94660D74834B0064F138 /* ffmpeg-minimal */ = { isa = PBXGroup; children = ( 830F0B8E17FC4FB900042E8F /* libavcodec */, @@ -969,7 +969,7 @@ 830F0BBA17FC4FB900042E8F /* libavutil */, B09E94730D74834B0064F138 /* config.h */, ); - path = "ffmpeg-strip-wma"; + path = "ffmpeg-minimal"; sourceTree = ""; }; /* End PBXGroup section */ @@ -1129,9 +1129,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* WMA Framework */ = { + 8DC2EF4F0486A6940098B216 /* FFMPEG Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WMA Framework" */; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "FFMPEG Framework" */; buildPhases = ( 8DC2EF500486A6940098B216 /* Headers */, 8DC2EF520486A6940098B216 /* Resources */, @@ -1142,10 +1142,10 @@ ); dependencies = ( ); - name = "WMA Framework"; + name = "FFMPEG Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; - productName = WMA; - productReference = 8DC2EF5B0486A6940098B216 /* WMA.framework */; + productName = FFMPEG; + productReference = 8DC2EF5B0486A6940098B216 /* FFMPEG.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -1156,19 +1156,19 @@ attributes = { LastUpgradeCheck = 0500; }; - buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WMA" */; + buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "FFMPEG" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( en, ); - mainGroup = 0867D691FE84028FC02AAC07 /* WMA */; + mainGroup = 0867D691FE84028FC02AAC07 /* FFMPEG */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 8DC2EF4F0486A6940098B216 /* WMA Framework */, + 8DC2EF4F0486A6940098B216 /* FFMPEG Framework */, ); }; /* End PBXProject section */ @@ -1342,15 +1342,15 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WMA_Prefix.pch; + GCC_PREFIX_HEADER = FFMPEG_Prefix.pch; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "ffmpeg-strip-wma", + "ffmpeg-minimal", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@loader_path/../Frameworks"; - PRODUCT_NAME = WMA; + PRODUCT_NAME = FFMPEG; SKIP_INSTALL = YES; SYMROOT = ../../build; WRAPPER_EXTENSION = framework; @@ -1368,15 +1368,15 @@ FRAMEWORK_VERSION = A; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WMA_Prefix.pch; + GCC_PREFIX_HEADER = FFMPEG_Prefix.pch; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "ffmpeg-strip-wma", + "ffmpeg-minimal", ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@loader_path/../Frameworks"; - PRODUCT_NAME = WMA; + PRODUCT_NAME = FFMPEG; SKIP_INSTALL = YES; SYMROOT = ../../build; WRAPPER_EXTENSION = framework; @@ -1411,7 +1411,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WMA Framework" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "FFMPEG Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, @@ -1420,7 +1420,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WMA" */ = { + 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "FFMPEG" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91B208733DA50010E9CD /* Debug */, diff --git a/Frameworks/WMA/WMA.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Frameworks/FFMPEG/FFMPEG.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Frameworks/WMA/WMA.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Frameworks/FFMPEG/FFMPEG.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Frameworks/FFMPEG/FFMPEG_Prefix.pch b/Frameworks/FFMPEG/FFMPEG_Prefix.pch new file mode 100644 index 000000000..45e581823 --- /dev/null +++ b/Frameworks/FFMPEG/FFMPEG_Prefix.pch @@ -0,0 +1,7 @@ +// +// Prefix header for all source files of the 'FFMPEG' target in the 'FFMPEG' project. +// + +#ifdef __OBJC__ + #import +#endif diff --git a/Frameworks/WMA/Info.plist b/Frameworks/FFMPEG/Info.plist similarity index 100% rename from Frameworks/WMA/Info.plist rename to Frameworks/FFMPEG/Info.plist diff --git a/Frameworks/WMA/ffmpeg-strip-wma/COPYING b/Frameworks/FFMPEG/ffmpeg-minimal/COPYING similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/COPYING rename to Frameworks/FFMPEG/ffmpeg-minimal/COPYING diff --git a/Frameworks/WMA/ffmpeg-strip-wma/CREDITS b/Frameworks/FFMPEG/ffmpeg-minimal/CREDITS similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/CREDITS rename to Frameworks/FFMPEG/ffmpeg-minimal/CREDITS diff --git a/Frameworks/WMA/ffmpeg-strip-wma/compat/va_copy.h b/Frameworks/FFMPEG/ffmpeg-minimal/compat/va_copy.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/compat/va_copy.h rename to Frameworks/FFMPEG/ffmpeg-minimal/compat/va_copy.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/config.h b/Frameworks/FFMPEG/ffmpeg-minimal/config.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/config.h rename to Frameworks/FFMPEG/ffmpeg-minimal/config.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aac.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aac.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aac.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aac.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aac_tablegen.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aac_tablegen.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aac_tablegen.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aac_tablegen.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aac_tablegen_decl.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aac_tablegen_decl.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aac_tablegen_decl.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aac_tablegen_decl.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aacps.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aacps.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aacps.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aacps.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aacpsdsp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aacpsdsp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aacpsdsp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aacpsdsp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aactab.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aactab.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aactab.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aactab.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aactab.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aactab.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/aactab.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/aactab.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_filters.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_filters.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_filters.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_filters.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_filters.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_filters.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_filters.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_filters.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_pitch_delay.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_pitch_delay.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_pitch_delay.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_pitch_delay.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_pitch_delay.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_pitch_delay.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_pitch_delay.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_pitch_delay.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_vectors.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_vectors.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_vectors.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_vectors.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_vectors.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_vectors.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/acelp_vectors.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/acelp_vectors.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/allcodecs.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/allcodecs.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/allcodecs.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/allcodecs.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avcodec.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avcodec.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avcodec.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avcodec.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avfft.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avfft.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avfft.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avfft.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avfft.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avfft.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avfft.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avfft.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avpacket.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avpacket.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avpacket.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avpacket.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avpicture.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avpicture.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/avpicture.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/avpicture.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bit_depth_template.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/bit_depth_template.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bit_depth_template.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/bit_depth_template.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bitstream.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/bitstream.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bitstream.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/bitstream.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bytestream.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/bytestream.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/bytestream.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/bytestream.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_filters.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_filters.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_filters.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_filters.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_filters.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_filters.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_filters.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_filters.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_math.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_math.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_math.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_math.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_math.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_math.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/celp_math.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/celp_math.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/codec_desc.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/codec_desc.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/codec_desc.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/codec_desc.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/copy_block.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/copy_block.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/copy_block.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/copy_block.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct32.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct32.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct32.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct32.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct32.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct32.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct32.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct32.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct32_float.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct32_float.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dct32_float.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dct32_float.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dctref.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dctref.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dctref.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dctref.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dctref.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dctref.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dctref.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dctref.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/diracdsp.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/diracdsp.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/diracdsp.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/diracdsp.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/diracdsp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/diracdsp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/diracdsp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/diracdsp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dsputil.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dsputil.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dsputil.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dsputil.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dsputil.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dsputil.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dsputil.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dsputil.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dsputil_template.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dsputil_template.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dsputil_template.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dsputil_template.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dv_profile.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dv_profile.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dv_profile.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dv_profile.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dv_profile.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dv_profile.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dv_profile.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dv_profile.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dvdata.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dvdata.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dvdata.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dvdata.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dvdata.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dvdata.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/dvdata.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/dvdata.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/error_resilience.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/error_resilience.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/error_resilience.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/error_resilience.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/error_resilience.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faandct.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faandct.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faandct.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faandct.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faandct.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faandct.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faandct.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faandct.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faanidct.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faanidct.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faanidct.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faanidct.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faanidct.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faanidct.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/faanidct.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/faanidct.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fft-internal.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fft-internal.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fft-internal.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fft-internal.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fft.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fft.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fft.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fft.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fft.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fft.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fft.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fft.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fmtconvert.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fmtconvert.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fmtconvert.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fmtconvert.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fmtconvert.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fmtconvert.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/fmtconvert.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/fmtconvert.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/frame_thread_encoder.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/frame_thread_encoder.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/frame_thread_encoder.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/frame_thread_encoder.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/frame_thread_encoder.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/frame_thread_encoder.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/frame_thread_encoder.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/frame_thread_encoder.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/get_bits.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/get_bits.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/get_bits.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/get_bits.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/h264chroma.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/h264chroma.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/h264chroma.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/h264chroma.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/h264chroma.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/h264chroma.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/h264chroma.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/h264chroma.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/h264chroma_template.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/h264chroma_template.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/h264chroma_template.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/h264chroma_template.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpel_template.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpel_template.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpel_template.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpel_template.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpeldsp.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpeldsp.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpeldsp.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpeldsp.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpeldsp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpeldsp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpeldsp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpeldsp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpeldsp_template.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpeldsp_template.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/hpeldsp_template.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/hpeldsp_template.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/imgconvert.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/imgconvert.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/imgconvert.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/imgconvert.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/imgconvert.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/internal.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/internal.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/internal.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/internal.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/lsp.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/lsp.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/lsp.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/lsp.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/lsp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/lsp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/lsp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/lsp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mathops.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mathops.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mathops.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mathops.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mathtables.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mathtables.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mathtables.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mathtables.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mdct.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mdct.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mdct.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mdct.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mips/lsp_mips.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mips/lsp_mips.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mips/lsp_mips.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mips/lsp_mips.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg12data.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg12data.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg12data.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg12data.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg12data.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg12data.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg12data.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg12data.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg4audio.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg4audio.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg4audio.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg4audio.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg4audio.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg4audio.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpeg4audio.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpeg4audio.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpegvideo.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpegvideo.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/mpegvideo.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/mpegvideo.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/old_codec_ids.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/old_codec_ids.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/old_codec_ids.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/old_codec_ids.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/options.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/options.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options_table.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/options_table.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/options_table.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/options_table.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/parser.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/parser.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/parser.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/parser.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/parser.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/parser.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/parser.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/parser.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/put_bits.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/put_bits.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/put_bits.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/put_bits.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/ratecontrol.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/ratecontrol.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/ratecontrol.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/ratecontrol.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/ratecontrol.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/ratecontrol.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/ratecontrol.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/ratecontrol.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/raw.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/raw.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/raw.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/raw.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/raw.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/raw.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/raw.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/raw.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rawdec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rawdec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rawdec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rawdec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rdft.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rdft.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rdft.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rdft.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rdft.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rdft.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rdft.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rdft.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rectangle.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rectangle.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rectangle.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rectangle.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rl.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rl.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rl.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rl.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rnd_avg.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rnd_avg.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/rnd_avg.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/rnd_avg.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sbr.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sbr.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sbr.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sbr.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sbrdsp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sbrdsp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sbrdsp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sbrdsp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/simple_idct.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/simple_idct.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/simple_idct.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/simple_idct.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/simple_idct.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/simple_idct.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/simple_idct.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/simple_idct.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/simple_idct_template.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/simple_idct_template.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/simple_idct_template.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/simple_idct_template.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin_tablegen.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin_tablegen.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin_tablegen.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin_tablegen.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin_tablegen.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin_tablegen.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/sinewin_tablegen.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/sinewin_tablegen.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/tableprint.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/tableprint.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/tableprint.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/tableprint.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/thread.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/thread.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/thread.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/thread.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/utils.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/utils.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/utils.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/utils.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/version.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/version.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/version.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/version.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/videodsp.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/videodsp.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/videodsp.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/videodsp.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/videodsp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/videodsp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/videodsp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/videodsp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/videodsp_template.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/videodsp_template.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/videodsp_template.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/videodsp_template.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma_common.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma_common.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma_common.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma_common.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma_common.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma_common.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wma_common.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wma_common.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmadata.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmadata.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmadata.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmadata.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmadec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmadec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmadec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmadec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmalosslessdec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmalosslessdec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmalosslessdec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmalosslessdec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodata.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmaprodata.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodata.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmaprodata.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmaprodec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmaprodec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmaprodec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmavoice.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmavoice.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmavoice.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmavoice.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmavoice_data.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmavoice_data.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/wmavoice_data.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/wmavoice_data.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/constants.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/constants.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/constants.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/constants.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/constants.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/constants.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/constants.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/constants.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/dct_init.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/dct_init.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/dct_init.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/dct_init.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/diracdsp_mmx.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/diracdsp_mmx.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/diracdsp_mmx.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/diracdsp_mmx.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/diracdsp_mmx.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/diracdsp_mmx.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/diracdsp_mmx.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/diracdsp_mmx.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/dsputil_x86.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/dsputil_x86.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/dsputil_x86.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/dsputil_x86.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/fft_init.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/fft_init.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/fft_init.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/fft_init.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/fmtconvert_init.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/fmtconvert_init.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/fmtconvert_init.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/fmtconvert_init.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/h264chroma_init.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/h264chroma_init.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/h264chroma_init.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/h264chroma_init.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/hpeldsp_init.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/hpeldsp_init.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/hpeldsp_init.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/hpeldsp_init.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/mathops.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/mathops.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/mathops.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/mathops.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/videodsp_init.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/videodsp_init.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavcodec/x86/videodsp_init.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/x86/videodsp_init.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/allformats.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/allformats.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/allformats.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/allformats.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asf.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asf.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/asf.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asf.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asf.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asf.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/asf.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asf.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfcrypt.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asfcrypt.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfcrypt.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asfcrypt.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfcrypt.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asfcrypt.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfcrypt.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asfcrypt.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfdec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asfdec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/asfdec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/asfdec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/ast.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/ast.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/ast.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/ast.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/ast.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/ast.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/ast.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/ast.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/astdec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/astdec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/astdec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/astdec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/audiointerleave.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/audiointerleave.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/audiointerleave.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/audiointerleave.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/audiointerleave.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/audiointerleave.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/audiointerleave.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/audiointerleave.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avformat.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avformat.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avformat.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avformat.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avi.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avi.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avi.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avi.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avidec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avidec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avidec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avidec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avio.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avio.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avio.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avio.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio_internal.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avio_internal.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avio_internal.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avio_internal.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/aviobuf.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/aviobuf.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/aviobuf.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/aviobuf.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avlanguage.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avlanguage.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avlanguage.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avlanguage.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/avlanguage.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avlanguage.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/avlanguage.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/avlanguage.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/cutils.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/cutils.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/cutils.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/cutils.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/dv.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/dv.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/dv.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/dv.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/dv.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/dv.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/dv.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/dv.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/file.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/file.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/file.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/file.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/format.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/format.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/format.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/format.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v1.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v1.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v1.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v1.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v1.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v1.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v1.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v1.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v2.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v2.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v2.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/id3v2.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/id3v2.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/internal.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/internal.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/internal.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/internal.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/metadata.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/metadata.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/metadata.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/metadata.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/metadata.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/metadata.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/metadata.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/metadata.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/mux.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/mux.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/mux.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/mux.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/options.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/options.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/options.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/options.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/options_table.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/options_table.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/options_table.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/options_table.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/os_support.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/os_support.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/os_support.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/os_support.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/os_support.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/os_support.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/os_support.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/os_support.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/pcm.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/pcm.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/pcm.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/pcm.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/pcm.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/pcm.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/pcm.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/pcm.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/rdt.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/rdt.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/rdt.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/rdt.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/riff.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/riff.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/riff.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/riff.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/riff.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/riff.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/riff.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/riff.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/riffdec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/riffdec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/riffdec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/riffdec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/rtp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/rtp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/rtp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/rtp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/rtpdec.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/rtpdec.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/rtpdec.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/rtpdec.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/spdif.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/spdif.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/spdif.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/spdif.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/spdif.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/spdif.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/spdif.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/spdif.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/srtp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/srtp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/srtp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/srtp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/url.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/url.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/url.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/url.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/url.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/url.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/url.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/url.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/utils.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/utils.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/utils.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/utils.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/version.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/version.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/version.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/version.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/w64.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/w64.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/w64.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/w64.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/w64.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/w64.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/w64.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/w64.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/wavdec.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/wavdec.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/wavdec.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/wavdec.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/xmv.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/xmv.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/xmv.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/xmv.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavformat/xwma.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavformat/xwma.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavformat/xwma.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavformat/xwma.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/atomic.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/atomic.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/atomic.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/atomic.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/atomic.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/atomic.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/atomic.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/atomic.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/atomic_gcc.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/atomic_gcc.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/atomic_gcc.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/atomic_gcc.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/attributes.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/attributes.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/attributes.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/attributes.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/avassert.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avassert.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/avassert.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avassert.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/avconfig.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avconfig.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/avconfig.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avconfig.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/avstring.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avstring.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/avstring.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avstring.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/avstring.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avstring.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/avstring.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avstring.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/avutil.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avutil.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/avutil.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/avutil.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/bprint.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/bprint.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/bprint.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/bprint.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/bprint.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/bswap.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/bswap.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/bswap.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/bswap.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/buffer.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/buffer.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/buffer.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/buffer.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/buffer.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/buffer.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/buffer.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/buffer.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/buffer_internal.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/buffer_internal.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/buffer_internal.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/buffer_internal.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/channel_layout.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/channel_layout.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/channel_layout.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/channel_layout.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/channel_layout.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/channel_layout.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/channel_layout.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/channel_layout.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/colorspace.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/colorspace.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/colorspace.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/colorspace.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/common.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/common.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/common.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/common.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/cpu.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/cpu.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/cpu.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/cpu.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu_internal.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/cpu_internal.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/cpu_internal.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/cpu_internal.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/crc.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/crc.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/crc.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/crc.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/crc.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/crc.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/crc.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/crc.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/des.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/des.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/des.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/des.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/des.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/des.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/des.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/des.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/dict.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/dict.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/dict.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/dict.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/dict.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/dict.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/dict.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/dict.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/error.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/error.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/error.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/error.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/error.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/error.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/error.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/error.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/eval.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/eval.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/eval.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/eval.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/eval.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/fifo.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/fifo.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/fifo.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/fifo.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/fifo.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/fifo.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/fifo.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/fifo.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/file_open.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/file_open.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/file_open.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/file_open.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/float_dsp.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/float_dsp.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/float_dsp.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/float_dsp.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/float_dsp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/float_dsp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/float_dsp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/float_dsp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/frame.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/frame.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/frame.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/frame.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/frame.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/imgutils.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/imgutils.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/imgutils.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/imgutils.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/imgutils.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/imgutils.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/imgutils.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/imgutils.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/integer.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/integer.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/integer.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/integer.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/integer.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/integer.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/integer.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/integer.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/internal.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/internal.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/internal.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/internal.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/intfloat.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intfloat.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/intfloat.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intfloat.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/intfloat_readwrite.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intfloat_readwrite.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/intfloat_readwrite.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intfloat_readwrite.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/intfloat_readwrite.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intfloat_readwrite.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/intfloat_readwrite.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intfloat_readwrite.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/intmath.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intmath.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/intmath.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intmath.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/intmath.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intmath.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/intmath.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intmath.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/intreadwrite.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intreadwrite.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/intreadwrite.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/intreadwrite.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/libm.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/libm.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/libm.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/libm.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/log.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/log.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/log.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/log.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/log.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/log2_tab.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/log2_tab.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/log2_tab.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/log2_tab.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/mathematics.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mathematics.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/mathematics.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mathematics.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/mathematics.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mathematics.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/mathematics.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mathematics.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/mem.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mem.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/mem.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mem.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/mem.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mem.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/mem.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/mem.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/old_pix_fmts.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/old_pix_fmts.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/old_pix_fmts.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/old_pix_fmts.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/opt.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/opt.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/opt.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/opt.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/opt.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/parseutils.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/parseutils.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/parseutils.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/parseutils.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/parseutils.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/parseutils.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/parseutils.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/parseutils.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/pixdesc.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/pixdesc.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/pixdesc.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixdesc.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/pixdesc.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixfmt.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/pixfmt.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/pixfmt.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/pixfmt.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/random_seed.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/random_seed.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/random_seed.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/random_seed.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/random_seed.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/random_seed.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/random_seed.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/random_seed.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/rational.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rational.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/rational.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rational.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/rational.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rational.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/rational.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rational.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/rc4.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rc4.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/rc4.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rc4.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/rc4.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rc4.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/rc4.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/rc4.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/samplefmt.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/samplefmt.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/samplefmt.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/samplefmt.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/samplefmt.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/samplefmt.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/samplefmt.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/samplefmt.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/sha.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/sha.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/sha.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/sha.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/sha.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/time.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/time.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/time.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/time.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/time_.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/time_.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/time_.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/time_.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/timecode.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timecode.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/timecode.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timecode.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/timecode.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timecode.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/timecode.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timecode.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/timer.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timer.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/timer.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timer.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/timestamp.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timestamp.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/timestamp.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/timestamp.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/utils.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/utils.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/utils.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/utils.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/version.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/version.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/version.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/version.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/asm.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/asm.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/asm.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/asm.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/bswap.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/bswap.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/bswap.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/bswap.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/cpu.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/cpu.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/cpu.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/cpu.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/cpu.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/cpu.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/cpu.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/cpu.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/emms.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/emms.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/emms.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/emms.h diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/float_dsp_init.c b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/float_dsp_init.c similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/float_dsp_init.c rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/float_dsp_init.c diff --git a/Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/timer.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/timer.h similarity index 100% rename from Frameworks/WMA/ffmpeg-strip-wma/libavutil/x86/timer.h rename to Frameworks/FFMPEG/ffmpeg-minimal/libavutil/x86/timer.h diff --git a/Plugins/WMA/English.lproj/InfoPlist.strings b/Plugins/FFMPEG/English.lproj/InfoPlist.strings similarity index 100% rename from Plugins/WMA/English.lproj/InfoPlist.strings rename to Plugins/FFMPEG/English.lproj/InfoPlist.strings diff --git a/Plugins/WMA/WMA.xcodeproj/project.pbxproj b/Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj similarity index 72% rename from Plugins/WMA/WMA.xcodeproj/project.pbxproj rename to Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj index 75e85813d..a5b50d7e7 100644 --- a/Plugins/WMA/WMA.xcodeproj/project.pbxproj +++ b/Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj @@ -7,28 +7,28 @@ objects = { /* Begin PBXBuildFile section */ - 834225D317FFBD2200DD3E2F /* WMAFileProtocols.m in Sources */ = {isa = PBXBuildFile; fileRef = 834225D217FFBD2200DD3E2F /* WMAFileProtocols.m */; }; + 834225D317FFBD2200DD3E2F /* FFMPEGFileProtocols.m in Sources */ = {isa = PBXBuildFile; fileRef = 834225D217FFBD2200DD3E2F /* FFMPEGFileProtocols.m */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; - B09E942F0D747F410064F138 /* WMADecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = B09E942E0D747F410064F138 /* WMADecoder.m */; }; - B09E95560D749A780064F138 /* WMA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B09E95080D748F9B0064F138 /* WMA.framework */; }; - B09E95E50D74A3000064F138 /* WMA.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E95080D748F9B0064F138 /* WMA.framework */; }; + B09E942F0D747F410064F138 /* FFMPEGDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = B09E942E0D747F410064F138 /* FFMPEGDecoder.m */; }; + B09E95560D749A780064F138 /* FFMPEG.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B09E95080D748F9B0064F138 /* FFMPEG.framework */; }; + B09E95E50D74A3000064F138 /* FFMPEG.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E95080D748F9B0064F138 /* FFMPEG.framework */; }; B09E95E60D74A30E0064F138 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94370D747FAD0064F138 /* Plugin.h */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ B09E95070D748F9B0064F138 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B09E95030D748F9B0064F138 /* WMA.xcodeproj */; + containerPortal = B09E95030D748F9B0064F138 /* FFMPEG.xcodeproj */; proxyType = 2; remoteGlobalIDString = 8DC2EF5B0486A6940098B216; - remoteInfo = WMA; + remoteInfo = FFMPEG; }; B09E95450D7496C60064F138 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B09E95030D748F9B0064F138 /* WMA.xcodeproj */; + containerPortal = B09E95030D748F9B0064F138 /* FFMPEG.xcodeproj */; proxyType = 1; remoteGlobalIDString = 8DC2EF4F0486A6940098B216; - remoteInfo = "WMA Framework"; + remoteInfo = "FFMPEG Framework"; }; /* End PBXContainerItemProxy section */ @@ -40,7 +40,7 @@ dstSubfolderSpec = 10; files = ( B09E95E60D74A30E0064F138 /* Plugin.h in CopyFiles */, - B09E95E50D74A3000064F138 /* WMA.framework in CopyFiles */, + B09E95E50D74A3000064F138 /* FFMPEG.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,15 +50,15 @@ 089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 32DBCF630370AF2F00C91783 /* WMA_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMA_Prefix.pch; sourceTree = ""; }; - 834225D117FFBD2200DD3E2F /* WMAFileProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMAFileProtocols.h; sourceTree = ""; }; - 834225D217FFBD2200DD3E2F /* WMAFileProtocols.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WMAFileProtocols.m; sourceTree = ""; }; - 8D5B49B6048680CD000E48DA /* WMA.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WMA.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + 32DBCF630370AF2F00C91783 /* FFMPEG_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFMPEG_Prefix.pch; sourceTree = ""; }; + 834225D117FFBD2200DD3E2F /* FFMPEGFileProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFMPEGFileProtocols.h; sourceTree = ""; }; + 834225D217FFBD2200DD3E2F /* FFMPEGFileProtocols.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FFMPEGFileProtocols.m; sourceTree = ""; }; + 8D5B49B6048680CD000E48DA /* FFMPEG.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FFMPEG.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B09E942D0D747F410064F138 /* WMADecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMADecoder.h; sourceTree = ""; }; - B09E942E0D747F410064F138 /* WMADecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WMADecoder.m; sourceTree = ""; }; + B09E942D0D747F410064F138 /* FFMPEGDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFMPEGDecoder.h; sourceTree = ""; }; + B09E942E0D747F410064F138 /* FFMPEGDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FFMPEGDecoder.m; sourceTree = ""; }; B09E94370D747FAD0064F138 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - B09E95030D748F9B0064F138 /* WMA.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WMA.xcodeproj; path = ../../Frameworks/WMA/WMA.xcodeproj; sourceTree = SOURCE_ROOT; }; + B09E95030D748F9B0064F138 /* FFMPEG.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FFMPEG.xcodeproj; path = ../../Frameworks/FFMPEG/FFMPEG.xcodeproj; sourceTree = SOURCE_ROOT; }; B09E95F50D74A3ED0064F138 /* Frameworks-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Frameworks-Info.plist"; sourceTree = ""; }; D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -68,7 +68,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B09E95560D749A780064F138 /* WMA.framework in Frameworks */, + B09E95560D749A780064F138 /* FFMPEG.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -76,7 +76,7 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 089C166AFE841209C02AAC07 /* WMA */ = { + 089C166AFE841209C02AAC07 /* FFMPEG */ = { isa = PBXGroup; children = ( 08FB77AFFE84173DC02AAC07 /* Classes */, @@ -86,7 +86,7 @@ 19C28FB8FE9D52D311CA2CBB /* Products */, B09E95F50D74A3ED0064F138 /* Frameworks-Info.plist */, ); - name = WMA; + name = FFMPEG; sourceTree = ""; }; 089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = { @@ -109,11 +109,11 @@ 08FB77AFFE84173DC02AAC07 /* Classes */ = { isa = PBXGroup; children = ( - 834225D117FFBD2200DD3E2F /* WMAFileProtocols.h */, - 834225D217FFBD2200DD3E2F /* WMAFileProtocols.m */, + 834225D117FFBD2200DD3E2F /* FFMPEGFileProtocols.h */, + 834225D217FFBD2200DD3E2F /* FFMPEGFileProtocols.m */, B09E94370D747FAD0064F138 /* Plugin.h */, - B09E942D0D747F410064F138 /* WMADecoder.h */, - B09E942E0D747F410064F138 /* WMADecoder.m */, + B09E942D0D747F410064F138 /* FFMPEGDecoder.h */, + B09E942E0D747F410064F138 /* FFMPEGDecoder.m */, ); name = Classes; sourceTree = ""; @@ -121,7 +121,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - B09E95030D748F9B0064F138 /* WMA.xcodeproj */, + B09E95030D748F9B0064F138 /* FFMPEG.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -140,7 +140,7 @@ 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8D5B49B6048680CD000E48DA /* WMA.bundle */, + 8D5B49B6048680CD000E48DA /* FFMPEG.bundle */, ); name = Products; sourceTree = ""; @@ -148,7 +148,7 @@ 32C88E010371C26100C91783 /* Other Sources */ = { isa = PBXGroup; children = ( - 32DBCF630370AF2F00C91783 /* WMA_Prefix.pch */, + 32DBCF630370AF2F00C91783 /* FFMPEG_Prefix.pch */, ); name = "Other Sources"; sourceTree = ""; @@ -156,7 +156,7 @@ B09E95040D748F9B0064F138 /* Products */ = { isa = PBXGroup; children = ( - B09E95080D748F9B0064F138 /* WMA.framework */, + B09E95080D748F9B0064F138 /* FFMPEG.framework */, ); name = Products; sourceTree = ""; @@ -164,9 +164,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* WMA Plugin */ = { + 8D5B49AC048680CD000E48DA /* FFMPEG Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "WMA Plugin" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "FFMPEG Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -178,10 +178,10 @@ dependencies = ( B09E95460D7496C60064F138 /* PBXTargetDependency */, ); - name = "WMA Plugin"; + name = "FFMPEG Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; - productName = WMA; - productReference = 8D5B49B6048680CD000E48DA /* WMA.bundle */; + productName = FFMPEG; + productReference = 8D5B49B6048680CD000E48DA /* FFMPEG.bundle */; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ @@ -192,33 +192,33 @@ attributes = { LastUpgradeCheck = 0500; }; - buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "WMA" */; + buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "FFMPEG" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( en, ); - mainGroup = 089C166AFE841209C02AAC07 /* WMA */; + mainGroup = 089C166AFE841209C02AAC07 /* FFMPEG */; projectDirPath = ""; projectReferences = ( { ProductGroup = B09E95040D748F9B0064F138 /* Products */; - ProjectRef = B09E95030D748F9B0064F138 /* WMA.xcodeproj */; + ProjectRef = B09E95030D748F9B0064F138 /* FFMPEG.xcodeproj */; }, ); projectRoot = ""; targets = ( - 8D5B49AC048680CD000E48DA /* WMA Plugin */, + 8D5B49AC048680CD000E48DA /* FFMPEG Plugin */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - B09E95080D748F9B0064F138 /* WMA.framework */ = { + B09E95080D748F9B0064F138 /* FFMPEG.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = WMA.framework; + path = FFMPEG.framework; remoteRef = B09E95070D748F9B0064F138 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -239,8 +239,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B09E942F0D747F410064F138 /* WMADecoder.m in Sources */, - 834225D317FFBD2200DD3E2F /* WMAFileProtocols.m in Sources */, + B09E942F0D747F410064F138 /* FFMPEGDecoder.m in Sources */, + 834225D317FFBD2200DD3E2F /* FFMPEGFileProtocols.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -249,7 +249,7 @@ /* Begin PBXTargetDependency section */ B09E95460D7496C60064F138 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "WMA Framework"; + name = "FFMPEG Framework"; targetProxy = B09E95450D7496C60064F138 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -262,8 +262,8 @@ COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/../../Frameworks/WMA/build/Release\"", - "\"$(SRCROOT)/../../Frameworks/WMA/build/Debug\"", + "\"$(SRCROOT)/../../Frameworks/FFMPEG/build/Release\"", + "\"$(SRCROOT)/../../Frameworks/FFMPEG/build/Debug\"", "\"$(SRCROOT)/../../build/Release\"", ); GCC_DYNAMIC_NO_PIC = NO; @@ -271,14 +271,14 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WMA_Prefix.pch; + GCC_PREFIX_HEADER = FFMPEG_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/../../Frameworks/WMA/build/Debug/WMA.framework\"", + "\"$(SRCROOT)/../../Frameworks/FFMPEG/build/Debug/FFMPEG.framework\"", ); - PRODUCT_NAME = WMA; + PRODUCT_NAME = FFMPEG; SKIP_INSTALL = YES; SYMROOT = ../../build; WRAPPER_EXTENSION = bundle; @@ -297,11 +297,11 @@ ); GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WMA_Prefix.pch; + GCC_PREFIX_HEADER = FFMPEG_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; - PRODUCT_NAME = WMA; + PRODUCT_NAME = FFMPEG; SKIP_INSTALL = YES; SYMROOT = ../../build; WRAPPER_EXTENSION = bundle; @@ -335,7 +335,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "WMA Plugin" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "FFMPEG Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, @@ -344,7 +344,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "WMA" */ = { + 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "FFMPEG" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913F08733D840010E9CD /* Debug */, diff --git a/Plugins/WMA/WMADecoder.h b/Plugins/FFMPEG/FFMPEGDecoder.h similarity index 80% rename from Plugins/WMA/WMADecoder.h rename to Plugins/FFMPEG/FFMPEGDecoder.h index 088f3849f..f7472cb00 100644 --- a/Plugins/WMA/WMADecoder.h +++ b/Plugins/FFMPEG/FFMPEGDecoder.h @@ -1,6 +1,6 @@ // -// WMADecoder.h -// WMA +// FFMPEGDecoder.h +// FFMPEG // // Created by Andre Reffhaug on 2/26/08. // Copyright 2008 __MyCompanyName__. All rights reserved. @@ -10,11 +10,11 @@ #import "Plugin.h" #define __FRAMEWORK__ -#import "WMA/avcodec.h" -#import "WMA/avformat.h" +#import +#import #undef __FRAMEWORK__ -@interface WMADecoder : NSObject +@interface FFMPEGDecoder : NSObject { id source; void *sampleBuffer; diff --git a/Plugins/WMA/WMADecoder.m b/Plugins/FFMPEG/FFMPEGDecoder.m similarity index 97% rename from Plugins/WMA/WMADecoder.m rename to Plugins/FFMPEG/FFMPEGDecoder.m index f008ae650..7bf376217 100644 --- a/Plugins/WMA/WMADecoder.m +++ b/Plugins/FFMPEG/FFMPEGDecoder.m @@ -1,20 +1,20 @@ // -// WMADecoder.m -// WMA +// FFMPEGDecoder.m +// FFMPEG // // Created by Andre Reffhaug on 2/26/08. // Copyright 2008 __MyCompanyName__. All rights reserved. // // test -#import "WMADecoder.h" -#import "WMAFileProtocols.h" +#import "FFMPEGDecoder.h" +#import "FFMPEGFileProtocols.h" #include #define ST_BUFF 2048 -@implementation WMADecoder +@implementation FFMPEGDecoder int lockmgr_callback(void ** mutex, enum AVLockOp op) @@ -68,7 +68,7 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) if (err < 0) { - NSLog(@"Opening .WMA file failed horribly: %d", err); + NSLog(@"Opening file failed horribly: %d", err); return NO; } diff --git a/Plugins/WMA/WMAFileProtocols.h b/Plugins/FFMPEG/FFMPEGFileProtocols.h similarity index 85% rename from Plugins/WMA/WMAFileProtocols.h rename to Plugins/FFMPEG/FFMPEGFileProtocols.h index 6ee7145cf..8fc55c6b5 100644 --- a/Plugins/WMA/WMAFileProtocols.h +++ b/Plugins/FFMPEG/FFMPEGFileProtocols.h @@ -1,6 +1,6 @@ // -// WMAFileProtocols.h -// WMA +// FFMPEGFileProtocols.h +// FFMPEG // // Created by Christopher Snowhill on 10/4/13. // Copyright 2013 __NoWork, Inc__. All rights reserved. diff --git a/Plugins/WMA/WMAFileProtocols.m b/Plugins/FFMPEG/FFMPEGFileProtocols.m similarity index 97% rename from Plugins/WMA/WMAFileProtocols.m rename to Plugins/FFMPEG/FFMPEGFileProtocols.m index edc7eca28..58322f024 100644 --- a/Plugins/WMA/WMAFileProtocols.m +++ b/Plugins/FFMPEG/FFMPEGFileProtocols.m @@ -1,6 +1,6 @@ // -// WMAFileProtocols.m -// WMA +// FFMPEGFileProtocols.m +// FFMPEG // // Created by Christopher Snowhill on 10/4/13. // Copyright 2013 __NoWork, Inc__. All rights reserved. @@ -9,9 +9,9 @@ #include "Plugin.h" #define __FRAMEWORK__ -#import -#import -#import +#import +#import +#import #undef __FRAMEWORK__ /* standard file protocol */ diff --git a/Frameworks/WMA/WMA_Prefix.pch b/Plugins/FFMPEG/FFMPEG_Prefix.pch similarity index 100% rename from Frameworks/WMA/WMA_Prefix.pch rename to Plugins/FFMPEG/FFMPEG_Prefix.pch diff --git a/Plugins/WMA/Frameworks-Info.plist b/Plugins/FFMPEG/Frameworks-Info.plist similarity index 100% rename from Plugins/WMA/Frameworks-Info.plist rename to Plugins/FFMPEG/Frameworks-Info.plist diff --git a/Plugins/WMA/Info.plist b/Plugins/FFMPEG/Info.plist similarity index 100% rename from Plugins/WMA/Info.plist rename to Plugins/FFMPEG/Info.plist diff --git a/Plugins/WMA/WMA_Prefix.pch b/Plugins/WMA/WMA_Prefix.pch deleted file mode 100644 index 6b998c291..000000000 --- a/Plugins/WMA/WMA_Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'WMA' target in the 'WMA' project. -// - -#ifdef __OBJC__ - #import -#endif