Merge commit '35cbc98b'

* commit '35cbc98b':
  alac: Check that the channels fit at the given offset

Conflicts:
	libavcodec/alac.c

See: b53f8971Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/alac.c

@@ -463,9 +463,8 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
         }
 
         channels = (element == TYPE_CPE) ? 2 : 1;
-        if (   ch + channels > alac->channels
-            || ff_alac_channel_layout_offsets[alac->channels - 1][ch] + channels > alac->channels
-        ) {
+        if (ch + channels > alac->channels ||
+            ff_alac_channel_layout_offsets[alac->channels - 1][ch] + channels > alac->channels) {
             av_log(avctx, AV_LOG_ERROR, "invalid element channel count\n");
             return AVERROR_INVALIDDATA;
         }