From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Dec 2014 12:36:25 +0000 (+0100)
Subject: Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'
X-Git-Tag: n2.7-dev~1484
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/e67496fe9db3a25ac1bc08bd77eca95b79d25cac?hp=c266d0e1bd56272939feb4eeee91b927a27c0953

Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'

* commit 'cee4490b521fd0d02476d46aa2598af24fb8d686':
  on2avc: check number of channels

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

diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c
index 01977e5..9bf5e87 100644
--- a/libavcodec/on2avc.c
+++ b/libavcodec/on2avc.c
@@ -923,6 +923,7 @@ static av_cold int on2avc_decode_init(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR, "0x500 version should be mono\n");
         return AVERROR_INVALIDDATA;
     }
+
     if (avctx->channels == 2)
         av_log(avctx, AV_LOG_WARNING,
                "Stereo mode support is not good, patch is welcome\n");