# HG changeset patch
# User michael
# Date 1264107686 0
# Node ID d5320d1acaeece6f1754341d35fe7bba9b9e0911
# Parent  304db572a69a083203fd75f737e98f0a5d4a518d
Move dquant check into qscale overflow check.
This should be faster (couldnt meassue a difference), and its less picky
on slightly out of spec dquant.

diff -r 304db572a69a -r d5320d1acaee h264_cavlc.c
--- a/h264_cavlc.c	Thu Jan 21 16:50:31 2010 +0000
+++ b/h264_cavlc.c	Thu Jan 21 21:01:26 2010 +0000
@@ -936,15 +936,15 @@
 
         dquant= get_se_golomb(&s->gb);
 
-        if( dquant > 25 || dquant < -26 ){
-            av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y);
-            return -1;
-        }
+        s->qscale += dquant;
 
-        s->qscale += dquant;
         if(((unsigned)s->qscale) > 51){
             if(s->qscale<0) s->qscale+= 52;
             else            s->qscale-= 52;
+            if(((unsigned)s->qscale) > 51){
+                av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y);
+                return -1;
+            }
         }
 
         h->chroma_qp[0]= get_chroma_qp(h, 0, s->qscale);