[FFmpeg-cvslog] r13786 - trunk/libavcodec/g726.c

[michael]

Author: michael
Date: Tue Jun 17 01:20:11 2008
New Revision: 13786

Log:
Print sane error message for channels != 1.


Modified:
   trunk/libavcodec/g726.c

Modified: trunk/libavcodec/g726.c
==============================================================================
--- trunk/libavcodec/g726.c	(original)
+++ trunk/libavcodec/g726.c	Tue Jun 17 01:20:11 2008
@@ -324,7 +324,7 @@ static av_cold int g726_init(AVCodecCont
     AVG726Context* c = (AVG726Context*)avctx->priv_data;
     unsigned int index= (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2;
 
-    if (avctx->channels != 1 ||
+    if (
         (avctx->bit_rate != 16000 && avctx->bit_rate != 24000 &&
          avctx->bit_rate != 32000 && avctx->bit_rate != 40000)) {
         av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n");
@@ -334,6 +334,10 @@ static av_cold int g726_init(AVCodecCont
         av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n");
         return -1;
     }
+    if(avctx->channels != 1){
+        av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");
+        return -1;
+    }
     if(index>3){
         av_log(avctx, AV_LOG_ERROR, "Unsupported number of bits %d\n", index+2);
         return -1;