Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'

[ffmpeg] / libavcodec / twinvq.c

diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
index 754d7bfa39bb24f7794c6b62b550dedbb7407b37..8bb44cce29efadcc10269f0902f239e35af44d45 100644 (file)
--- a/libavcodec/twinvq.c
+++ b/libavcodec/twinvq.c
@@ -2,20 +2,20 @@
  * TwinVQ decoder
  * Copyright (c) 2009 Vitor Sessak
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -864,7 +864,7 @@ static int twin_decode_frame(AVCodecContext * avctx, void *data,
     }
 
     *got_frame_ptr   = 1;
-    *(AVFrame *)data = tctx->frame;;
+    *(AVFrame *)data = tctx->frame;
 
     return buf_size;
 }
@@ -1141,6 +1141,11 @@ static av_cold int twin_decode_init(AVCodecContext *avctx)
 
     ibps = avctx->bit_rate / (1000 * avctx->channels);
 
+    if (ibps > 255U) {
+        av_log(avctx, AV_LOG_ERROR, "unsupported per channel bitrate %dkbps\n", ibps);
+        return AVERROR_INVALIDDATA;
+    }
+
     switch ((isampf << 8) +  ibps) {
     case (8 <<8) +  8: tctx->mtab = &mode_08_08; break;
     case (11<<8) +  8: tctx->mtab = &mode_11_08; break;