diff options
| author | sr55 <[email protected]> | 2014-03-02 17:12:06 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-03-02 17:12:06 +0000 |
| commit | 3611993e93fc392bc50d926a3a91dafdf72d1c6c (patch) | |
| tree | 1cd3868399f19f1827190e33d365b9e51f04da9a /scripts/manicure.rb | |
| parent | 66e23a8e096410d5f2584b43acc56c416db3f62e (diff) | |
Remove libfaac
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6094 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'scripts/manicure.rb')
| -rwxr-xr-x | scripts/manicure.rb | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/scripts/manicure.rb b/scripts/manicure.rb index 5cbc9d906..a6fbaf571 100755 --- a/scripts/manicure.rb +++ b/scripts/manicure.rb @@ -349,9 +349,7 @@ class Display audioEncoders << "copy:dtshd" when /AAC Pass/ audioEncoders << "copy:aac" - when "AAC (faac)" - audioEncoders << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoders << "av_aac" when "AAC (FDK)" audioEncoders << "fdk_aac" @@ -468,9 +466,7 @@ class Display case hash["AudioEncoderFallback"] when /AC3/ audioEncoderFallback << "ac3" - when "AAC (faac)" - audioEncoderFallback << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoderFallback << "av_aac" when "AAC (FDK)" audioEncoderFallback << "fdk_aac" @@ -757,9 +753,7 @@ class Display audioEncoders << "copy:dtshd" when /AAC Pass/ audioEncoders << "copy:aac" - when "AAC (faac)" - audioEncoders << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoders << "av_aac" when "AAC (FDK)" audioEncoders << "fdk_aac" @@ -876,9 +870,7 @@ class Display case hash["AudioEncoderFallback"] when /AC3/ audioEncoderFallback << "ac3" - when "AAC (faac)" - audioEncoderFallback << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoderFallback << "av_aac" when "AAC (FDK)" audioEncoderFallback << "fdk_aac" @@ -1171,9 +1163,7 @@ class Display audioEncoders << "copy:dtshd" when /AAC Pass/ audioEncoders << "copy:aac" - when "AAC (faac)" - audioEncoders << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoders << "av_aac" when "AAC (FDK)" audioEncoders << "fdk_aac" @@ -1308,9 +1298,7 @@ class Display case hash["AudioEncoderFallback"] when /AC3/ audioEncoderFallback << "ac3" - when "AAC (faac)" - audioEncoderFallback << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoderFallback << "av_aac" when "AAC (FDK)" audioEncoderFallback << "fdk_aac" @@ -1627,9 +1615,7 @@ class Display audioEncoders << "copy:dtshd" when /AAC Pass/ audioEncoders << "copy:aac" - when "AAC (faac)" - audioEncoders << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoders << "av_aac" when "AAC (FDK)" audioEncoders << "fdk_aac" @@ -1746,9 +1732,7 @@ class Display case hash["AudioEncoderFallback"] when /AC3/ audioEncoderFallback << "ac3" - when "AAC (faac)" - audioEncoderFallback << "faac" - when "AAC (ffmpeg)", "AAC (avcodec)" + when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" audioEncoderFallback << "av_aac" when "AAC (FDK)" audioEncoderFallback << "fdk_aac" |