[vlc-commits] contribs: faad: add patched define in header

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu May  4 13:53:19 2017 +0200| [6bc7a6377e4c41ee4fce18533e19c7c45e8a887a] | committer: Francois Cartegnie

contribs: faad: add patched define in header

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6bc7a6377e4c41ee4fce18533e19c7c45e8a887a
---

 contrib/src/faad2/faad2-add-define.patch | 10 ++++++++++
 contrib/src/faad2/rules.mak              |  1 +
 modules/codec/faad.c                     |  2 ++
 3 files changed, 13 insertions(+)

diff --git a/contrib/src/faad2/faad2-add-define.patch b/contrib/src/faad2/faad2-add-define.patch
new file mode 100644
index 0000000000..4f95182f3e
--- /dev/null
+++ b/contrib/src/faad2/faad2-add-define.patch
@@ -0,0 +1,10 @@
+--- faad2/include/neaacdec.orig.h	2017-05-04 13:46:52.553943436 +0200
++++ faad2/include/neaacdec.h	2017-05-04 13:46:47.667989456 +0200
+@@ -70,6 +70,7 @@
+ #endif
+ 
+ #define FAAD2_VERSION "2.7"
++#define FAAD2_VIDEOLAN_PATCHED
+ 
+ /* object types for AAC */
+ #define MAIN       1
diff --git a/contrib/src/faad2/rules.mak b/contrib/src/faad2/rules.mak
index 6fd73668cf..4a4467b714 100644
--- a/contrib/src/faad2/rules.mak
+++ b/contrib/src/faad2/rules.mak
@@ -23,6 +23,7 @@ endif
 	$(APPLY) $(SRC)/faad2/faad2-disable-drc.patch
 	$(APPLY) $(SRC)/faad2/faad2-fix-71wPCEmapping.patch
 	$(APPLY) $(SRC)/faad2/faad2-fix-cpe-reconstruction.patch
+	$(APPLY) $(SRC)/faad2/faad2-add-define.patch
 	cd $(UNPACK_DIR) && $(CC) -iquote . -E - </dev/null || sed -i 's/-iquote /-I/' libfaad/Makefile.am
 	$(MOVE)
 
diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 3dff00b390..809983fd52 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -440,6 +440,7 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
             p_sys->b_ps = frame.ps;
         }
 
+#ifndef FAAD2_VIDEOLAN_PATCHED
         /* PS Enabled FAAD PCA bug hotfix (contribs has patch) */
         if( frame.channels == 8 )
         {
@@ -480,6 +481,7 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
                 break;
             }
         }
+#endif
 
         /* Convert frame.channel_position to our own channel values */
         p_dec->fmt_out.audio.i_physical_channels = 0;