[FFmpeg-cvslog] r11185 - in trunk/libavcodec: rv30.c rv40.c

[kostya]

Author: kostya
Date: Fri Dec  7 06:56:07 2007
New Revision: 11185

Log:
Use existing function for VLC reading

Modified:
   trunk/libavcodec/rv30.c
   trunk/libavcodec/rv40.c

Modified: trunk/libavcodec/rv30.c
==============================================================================
--- trunk/libavcodec/rv30.c	(original)
+++ trunk/libavcodec/rv30.c	Fri Dec  7 06:56:07 2007
@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
+#include "golomb.h"
 
 #include "rv34.h"
 #include "rv30data.h"
@@ -66,7 +67,7 @@ static int rv30_decode_intra_types(RV34D
 
     for(i = 0; i < 4; i++, dst += r->s.b4_stride - 4){
         for(j = 0; j < 4; j+= 2){
-            int code = (ff_rv34_get_gamma(gb) - 1) << 1;
+            int code = svq3_get_ue_golomb(gb) << 1;
             if(code >= 81*2){
                 av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n");
                 return -1;
@@ -94,7 +95,7 @@ static int rv30_decode_mb_info(RV34DecCo
     static const int rv30_b_types[6] = { RV34_MB_SKIP, RV34_MB_B_DIRECT, RV34_MB_B_FORWARD, RV34_MB_B_BACKWARD, RV34_MB_TYPE_INTRA, RV34_MB_TYPE_INTRA16x16 };
     MpegEncContext *s = &r->s;
     GetBitContext *gb = &s->gb;
-    int code = ff_rv34_get_gamma(gb) - 1;
+    int code = svq3_get_ue_golomb(gb);
 
     if(code > 11){
         av_log(s->avctx, AV_LOG_ERROR, "Incorrect MB type code\n");

Modified: trunk/libavcodec/rv40.c
==============================================================================
--- trunk/libavcodec/rv40.c	(original)
+++ trunk/libavcodec/rv40.c	Fri Dec  7 06:56:07 2007
@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
+#include "golomb.h"
 
 #include "rv34.h"
 #include "rv40vlc2.h"
@@ -207,7 +208,7 @@ static int rv40_decode_mb_info(RV34DecCo
     int count = 0;
 
     if(!r->s.mb_skip_run)
-        r->s.mb_skip_run = ff_rv34_get_gamma(gb);
+        r->s.mb_skip_run = svq3_get_ue_golomb(gb) + 1;
 
     if(--r->s.mb_skip_run)
          return RV34_MB_SKIP;