Mercurial > libavcodec.hg

changeset 7050:ecb7071103af libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct validity checks.
author michael
date Mon, 16 Jun 2008 23:23:56 +0000
parents bb24d15211a4
children 4f1331b0d428
files g726.c
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/g726.c	Mon Jun 16 23:20:11 2008 +0000
+++ b/g726.c	Mon Jun 16 23:23:56 2008 +0000
@@ -324,14 +324,8 @@
     AVG726Context* c = (AVG726Context*)avctx->priv_data;
     unsigned int index= (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2;
 
-    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");
-        return -1;
-    }
-    if (avctx->sample_rate != 8000 && avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL) {
-        av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n");
+    if (avctx->bit_rate % avctx->sample_rate && avctx->codec->encode) {
+        av_log(avctx, AV_LOG_ERROR, "Bitrate - Samplerate combination is invalid\n");
         return -1;
     }
     if(avctx->channels != 1){