[FFmpeg-cvslog] atrac3: Error on impossible encoding/channel combinations

[Luca Barbato]

ffmpeg | branch: release/0.10 | Luca Barbato <lu_zero at gentoo.org> | Tue Jul  9 04:44:26 2013 +0200| [93c524c0f0faf90ed99fcc2ac183a1de2cfda5f6] | committer: Michael Niedermayer

atrac3: Error on impossible encoding/channel combinations

Joint stereo encoded mono is impossible.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit 50cf5a7fb78846fc39b3ecdaa896a10bcd74da2a)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

Conflicts:
	libavcodec/atrac3.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93c524c0f0faf90ed99fcc2ac183a1de2cfda5f6
---

 libavcodec/atrac3.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 4ae2a27..7777b04 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -976,6 +976,8 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
     if (q->codingMode == STEREO) {
         av_log(avctx,AV_LOG_DEBUG,"Normal stereo detected.\n");
     } else if (q->codingMode == JOINT_STEREO) {
+        if (avctx->channels != 2)
+            return AVERROR_INVALIDDATA;
         av_log(avctx,AV_LOG_DEBUG,"Joint stereo detected.\n");
     } else {
         av_log(avctx,AV_LOG_ERROR,"Unknown channel coding mode %x!\n",q->codingMode);