From c81788429b337ee37f90410605f26e4b7be57983 Mon Sep 17 00:00:00 2001
From: Michael Bucari-Tovo <mbucari1@gmail.com>
Date: Mon, 21 Jun 2021 16:29:28 -0600
Subject: [PATCH] Revert "Hacked avformat-58 to ignore aac Scalable
 configurations error."

This reverts commit 26da3077437325d9bac1737ca21f8787d5efe16e.
---
 .gitignore                               |   1 -
 AaxDecrypter/AaxDecrypter.csproj         |   4 ----
 AaxDecrypter/AaxToM4bConverter.cs        |   4 ++--
 AaxDecrypter/DecryptLib/avformat-58.dll  | Bin 9848320 -> 9848320 bytes
 LibationLauncher/LibationLauncher.csproj |   2 +-
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 43718433..09f749e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -333,4 +333,3 @@ ASALocalRun/
 # manually ignored files
 /__TODO.txt
 /DataLayer/LibationContext.db
-/AaxDecrypter/DecryptLib/avformat-58.dll.bak
diff --git a/AaxDecrypter/AaxDecrypter.csproj b/AaxDecrypter/AaxDecrypter.csproj
index 56b60933..daab451a 100644
--- a/AaxDecrypter/AaxDecrypter.csproj
+++ b/AaxDecrypter/AaxDecrypter.csproj
@@ -4,10 +4,6 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="DecryptLib\avformat-58.dll.bak" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="taglib-sharp">
       <HintPath>lib\taglib-sharp.dll</HintPath>
diff --git a/AaxDecrypter/AaxToM4bConverter.cs b/AaxDecrypter/AaxToM4bConverter.cs
index b9237759..4fbfc4de 100644
--- a/AaxDecrypter/AaxToM4bConverter.cs
+++ b/AaxDecrypter/AaxToM4bConverter.cs
@@ -173,7 +173,7 @@ namespace AaxDecrypter
         {
             DecryptProgressUpdate?.Invoke(this, 0);
 
-            var tempRipFile = Path.Combine(outDir, "funny.aac");
+            var tempRipFile = Path.Combine(outDir, "funny.mp4");
 
             var fail = "WARNING-Decrypt failure. ";
 
@@ -235,7 +235,7 @@ namespace AaxDecrypter
                 + audible_iv
                 + " -i "
                 + "\"" + inputFileName + "\""
-                + " -c:a copy -vn -sn -dn -y -f adts "
+                + " -c:a copy -vn -sn -dn -y "
                 + "\"" + tempFileName + "\"";
 
             var info = new ProcessStartInfo
diff --git a/AaxDecrypter/DecryptLib/avformat-58.dll b/AaxDecrypter/DecryptLib/avformat-58.dll
index 3716181424a8fd030c5b21775503826d4f4d56a8..18ccd0e7cf700326001957e705c8c84b5b513ca7 100644
GIT binary patch
delta 619
zcmWmASt1kw002-$mKLN4S(A{+P6!P}ix??nsf1LNt&&nBiO@paqrd*ThkJAYua9?u
z7uwv52=Ti<7#X+H6BQP=90;xkf(JNAI1wBok|?5y;V?%y$}wVzBc9_VaDtO0lEf*J
zNg<Wfq>)YrnPid88FDyFF6YQ2p90QP$OVch<{~AOQbsuyR8mDXHC&>WI_kMh1C2Cs
zg#gX8aFuJc(#CaeaFbiKbDIu2`G45O9lE*8J$mS+kNfm9z#v0B;31C~<}o9TGR70e
zdCD`MGr=S;c*zvg%rMIwuXxQH=6TBk?|9E5ANWX!B|fptXIA*aDr<aYoeehm#&>@3
QlP$LS#m=8VaQE-OeN%(j$p8QV

delta 619
zcmW;I=Q<St0D$2qNs<bg8PO0?LZz}#i$ac(k&vxHyR15>q-47f|NL_w-A5PT&G$U-
z4Sb=czu_Ua%YqTB`^^V}3xVJP!Z=7chlt=XksKk4qeOFz<D4LdSmHQIJP9O{L^3Iy
zB9%1K$>21ZWO0VGoZ~#%Tp)*BE|Nz+m$*y;S16>2Vy<$H>y&VVo7|$5GRmo-k}9eR
zaGN{a<sSE`p_T_cq>g$Tctj)rA2!iU3#~k+jdnWd<Oy9orJEjlc}5@o3^2$L!;CP>
zb6)V0SBx>vYu@mdcf98VANj;*CYWT3X=eDsS3=A($2{No&JPy&$s)h_%@TiDW`$MO
OSZ9OHoj`DF_un25hub#*

diff --git a/LibationLauncher/LibationLauncher.csproj b/LibationLauncher/LibationLauncher.csproj
index bc9b948c..baa93b8a 100644
--- a/LibationLauncher/LibationLauncher.csproj
+++ b/LibationLauncher/LibationLauncher.csproj
@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>4.4.0.42</Version>
+    <Version>4.4.0.34</Version>
   </PropertyGroup>
 
   <ItemGroup>