[SCM] libav/experimental: Remove SHIFT_TEMPS from jfdct code. Patch by avcoder: our_beloved_project AT gmail DOT com See thread [FFmpeg-devel] Patch: remove useless SHIFT_TEMPS definition Date: Tue, 20 Oct 2009 14:29:05 +0800

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a0b909fbffb4318618e39a1345852f9720bd99fe
Author: avcoder <ffmpeg at gmail.com>
Date:   Tue Oct 20 11:19:54 2009 +0000

    Remove SHIFT_TEMPS from jfdct code.
    Patch by avcoder: our_beloved_project AT gmail DOT com
    See thread [FFmpeg-devel] Patch: remove useless SHIFT_TEMPS definition
    Date: Tue, 20 Oct 2009 14:29:05 +0800
    
    Originally committed as revision 20331 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c
index dcbe19e..9d05955 100644
--- a/libavcodec/jfdctfst.c
+++ b/libavcodec/jfdctfst.c
@@ -76,7 +76,6 @@
 #define DCTSIZE 8
 #define GLOBAL(x) x
 #define RIGHT_SHIFT(x, n) ((x) >> (n))
-#define SHIFT_TEMPS
 
 /*
  * This module is specialized to the case DCTSIZE = 8.
@@ -151,7 +150,6 @@ static av_always_inline void row_fdct(DCTELEM * data){
   int_fast16_t z1, z2, z3, z4, z5, z11, z13;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   /* Pass 1: process rows. */
 
@@ -216,7 +214,6 @@ fdct_ifast (DCTELEM * data)
   int_fast16_t z1, z2, z3, z4, z5, z11, z13;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   row_fdct(data);
 
@@ -283,7 +280,6 @@ fdct_ifast248 (DCTELEM * data)
   int_fast16_t z1;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   row_fdct(data);
 
diff --git a/libavcodec/jfdctint.c b/libavcodec/jfdctint.c
index b27657b..1d2c0ca 100644
--- a/libavcodec/jfdctint.c
+++ b/libavcodec/jfdctint.c
@@ -66,7 +66,6 @@
 #include "libavutil/common.h"
 #include "dsputil.h"
 
-#define SHIFT_TEMPS
 #define DCTSIZE 8
 #define BITS_IN_JSAMPLE 8
 #define GLOBAL(x) x
@@ -187,7 +186,6 @@ static av_always_inline void row_fdct(DCTELEM * data){
   int_fast32_t z1, z2, z3, z4, z5;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   /* Pass 1: process rows. */
   /* Note results are scaled up by sqrt(8) compared to a true DCT; */
@@ -266,7 +264,6 @@ ff_jpeg_fdct_islow (DCTELEM * data)
   int_fast32_t z1, z2, z3, z4, z5;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   row_fdct(data);
 
@@ -353,7 +350,6 @@ ff_fdct248_islow (DCTELEM * data)
   int_fast32_t z1;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   row_fdct(data);
 

-- 
Libav/FFmpeg packaging