* commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea': aacdec: avoid an out-of-bounds write Conflicts: libavcodec/aacdec.c See: ba02069a8e Merged-by: Michael Niedermayer <michaelni@gmx.at>
ba02069a8e