Merge commit '48952116352ab03565cc14805e0f1d63cf0318fe' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:21:07 +0000 (12:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:21:31 +0000 (12:21 +0100)
* commit '48952116352ab03565cc14805e0f1d63cf0318fe':
  on2avc: check number of channels

See: 550f3e9df3410b3dd975e590042c0d83e20a8da3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/on2avc.c

@@@ -923,6 -918,10 +923,7 @@@ static av_cold int on2avc_decode_init(A
          av_log(avctx, AV_LOG_ERROR, "0x500 version should be mono\n");
          return AVERROR_INVALIDDATA;
      }
 -    if (avctx->channels > 2) {
 -        av_log(avctx, AV_LOG_ERROR, "Only 1 or 2 channels are supported.\n");
 -        return AVERROR(EINVAL);
 -    }
++
      if (avctx->channels == 2)
          av_log(avctx, AV_LOG_WARNING,
                 "Stereo mode support is not good, patch is welcome\n");