-
Michael Niedermayer authored
* commit '35cbc98b': alac: Check that the channels fit at the given offset Conflicts: libavcodec/alac.c See: b53f8971Merged-by: Michael Niedermayer <michaelni@gmx.at>
f1b15c1e
* commit '35cbc98b': alac: Check that the channels fit at the given offset Conflicts: libavcodec/alac.c See: b53f8971Merged-by: Michael Niedermayer <michaelni@gmx.at>