From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 10 Jul 2013 10:24:58 +0000 (+0200)
Subject: Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'
X-Git-Tag: n2.1~2127
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/a3d9a21683557d1e6c4c4018eb7979a9504fff0d

Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'

* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

See: 13451f5520ce6b0afde861b2285dda659f8d4fb4

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

a3d9a21683557d1e6c4c4018eb7979a9504fff0d
diff --cc libavcodec/atrac3.c
index 0b56352,6a8fae7..2a46a05
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@@ -950,9 -941,11 +945,13 @@@ static av_cold int atrac3_decode_init(A
  
      if (q->coding_mode == STEREO)
          av_log(avctx, AV_LOG_DEBUG, "Normal stereo detected.\n");
-     else if (q->coding_mode == JOINT_STEREO)
+     else if (q->coding_mode == JOINT_STEREO) {
 -        if (avctx->channels != 2)
++        if (avctx->channels != 2) {
++            av_log(avctx, AV_LOG_ERROR, "Invalid coding mode\n");
+             return AVERROR_INVALIDDATA;
++        }
          av_log(avctx, AV_LOG_DEBUG, "Joint stereo detected.\n");
-     else {
+     } else {
          av_log(avctx, AV_LOG_ERROR, "Unknown channel coding mode %x!\n",
                 q->coding_mode);
          return AVERROR_INVALIDDATA;