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