[SCM] libav/experimental: Simplify ra144_decode_frame()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:20:48 UTC 2013


The following commit has been merged in the experimental branch:
commit 37e77035f24cfc166c25684cd4eccba58aad4c8c
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Sat May 17 14:38:12 2008 +0000

    Simplify ra144_decode_frame()
    
    Originally committed as revision 13194 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index b7e4c6f..8e5725e 100644
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -387,7 +387,6 @@ static int ra144_decode_frame(AVCodecContext * avctx,
     unsigned int a, b, c;
     int i;
     signed short *shptr;
-    int16_t *datao;
     int16_t *data = vdata;
     unsigned int val;
 
@@ -397,8 +396,6 @@ static int ra144_decode_frame(AVCodecContext * avctx,
     if(buf_size == 0)
         return 0;
 
-    datao = data;
-
     init_get_bits(&gb, buf, 20 * 8);
 
     for (i=0; i<10; i++)
@@ -449,7 +446,7 @@ static int ra144_decode_frame(AVCodecContext * avctx,
     FFSWAP(unsigned int *, glob->swapbuf1alt, glob->swapbuf1);
     FFSWAP(unsigned int *, glob->swapbuf2alt, glob->swapbuf2);
 
-    *data_size = (data-datao)*sizeof(*data);
+    *data_size = 2*160;
     return 20;
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list