Mercurial > libavcodec.hg

diff libgsm.c @ 12084:b6cf19580e47 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change all occurences of "inofficial" to "unofficial" in code, comments and options. Keep old options until next major version bump. Patch by Rodney Baker, rodney d baker a iinet d net d au
author cehoyos
date Sat, 03 Jul 2010 15:35:23 +0000
parents 7dd2a45249a9
children
line wrap: on
line diff
--- a/libgsm.c	Sat Jul 03 04:40:12 2010 +0000
+++ b/libgsm.c	Sat Jul 03 15:35:23 2010 +0000
@@ -54,7 +54,7 @@
         if (avctx->sample_rate != 8000) {
             av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
                 avctx->sample_rate);
-            if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
+            if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
                 return -1;
         }
         if (avctx->bit_rate != 13000 /* Official */ &&
@@ -62,7 +62,7 @@
             avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
             av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
                 avctx->bit_rate);
-            if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
+            if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
                 return -1;
         }
     }