[FFmpeg-cvslog] rv34: remove dead code in intra availability check

Christophe GISQUET git at videolan.org
Thu Mar 8 03:10:36 CET 2012


ffmpeg | branch: master | Christophe GISQUET <christophe.gisquet at gmail.com> | Thu Feb 23 19:10:32 2012 +0100| [294c05ce8a7fbe3de74023065c264c1d720ec3cd] | committer: Ronald S. Bultje

rv34: remove dead code in intra availability check

This was an incorrect copy-and-paste to a code not needing the original code.
Spotted by Jason in a previous review but forgotten in the commit.

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=294c05ce8a7fbe3de74023065c264c1d720ec3cd
---

 libavcodec/rv34.c |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index d0d72c0..83a9b9b 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1022,25 +1022,10 @@ static void rv34_output_i16x16(RV34DecContext *r, int8_t *intra_types, int cbp)
                     q_ac = rv34_qscale_tab[s->qscale];
     uint8_t        *dst  = s->dest[0];
     DCTELEM        *ptr  = s->block[0];
-    int       avail[6*8] = {0};
     int i, j, itype, has_ac;
 
     memset(block16, 0, 16 * sizeof(*block16));
 
-    // Set neighbour information.
-    if(r->avail_cache[1])
-        avail[0] = 1;
-    if(r->avail_cache[2])
-        avail[1] = avail[2] = 1;
-    if(r->avail_cache[3])
-        avail[3] = avail[4] = 1;
-    if(r->avail_cache[4])
-        avail[5] = 1;
-    if(r->avail_cache[5])
-        avail[8] = avail[16] = 1;
-    if(r->avail_cache[9])
-        avail[24] = avail[32] = 1;
-
     has_ac = rv34_decode_block(block16, gb, r->cur_vlcs, 3, 0, q_dc, q_dc, q_ac);
     if(has_ac)
         r->rdsp.rv34_inv_transform(block16);



More information about the ffmpeg-cvslog mailing list