Commit 6bc7a637 authored by François Cartegnie's avatar François Cartegnie 🤞

contribs: faad: add patched define in header

parent d96b177f
--- 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
......@@ -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)
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment