[FFmpeg-soc] [soc]: r705 - dirac/libavcodec/dirac.c

[marco]

Author: marco
Date: Sat Aug 11 23:22:14 2007
New Revision: 705

Log:
remove macros that are not used anymore

Modified:
   dirac/libavcodec/dirac.c

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Sat Aug 11 23:22:14 2007
@@ -1581,10 +1581,6 @@ static void dirac_subband_idwt_reorder(A
     int *line_hl;
     int *line_hh;
 
-#define POSX(x)                av_clip(x, 0, synth_width - 1)
-#define POSY(y)                av_clip(y, 0, synth_height - 1)
-#define POS(x, y)              (POSX(x) + POSY(y) * synth_width)
-
     line_ll    = data;
     line_hl    = data + width;
     line_lh    = data + height * s->padded_width;
@@ -1635,20 +1631,6 @@ START_TIMER
 
     dirac_subband_idwt_reorder(avctx, data, synth, level);
 
-    /* XXX: Use zero extension.  */
-#define POSX(x)                av_clip(x, 0, synth_width - 1)
-#define POSY(y)                av_clip(y, 0, synth_height - 1)
-#define POS(x, y)              (POSX(x) + POSY(y) * synth_width)
-#define POSS(x, y)              ((x) + (y) * synth_width)
-#define EVEN_POSX(x)           FFMAX(1, FFMIN(x, synth_width - 1))
-#define EVEN_POSY(y)           FFMAX(1, FFMIN(y, synth_height - 1))
-#define VSYNTH_EVEN_POS(x, y) (x + EVEN_POSY(y) * synth_width)
-#define HSYNTH_EVEN_POS(x, y) (EVEN_POSX(x) + y * synth_width)
-#define ODD_POSX(x)           FFMAX(0, FFMIN(x, synth_width - 2))
-#define ODD_POSY(y)           FFMAX(0, FFMIN(y, synth_height - 2))
-#define VSYNTH_ODD_POS(x, y)  (x + ODD_POSY(y) * synth_width)
-#define HSYNTH_ODD_POS(x, y)  (ODD_POSX(x) + y * synth_width)
-
     /* LeGall(5,3)
        First lifting step)
        Even, predict, s=5, t_{-1}=-1, t_0=9, t_1=9, t_2=-1:
@@ -1776,18 +1758,6 @@ START_TIMER
 
     dirac_subband_idwt_reorder(avctx, data, synth, level);
 
-#define POSX(x)                av_clip(x, 0, synth_width - 1)
-#define POSY(y)                av_clip(y, 0, synth_height - 1)
-#define POS(x, y)              (POSX(x) + POSY(y) * synth_width)
-#define EVEN_POSX(x)           FFMAX(1, FFMIN(x, synth_width - 1))
-#define EVEN_POSY(y)           FFMAX(1, FFMIN(y, synth_height - 1))
-#define VSYNTH_EVEN_POS(x, y) (x + EVEN_POSY(y) * synth_width)
-#define HSYNTH_EVEN_POS(x, y) (EVEN_POSX(x) + y * synth_width)
-#define ODD_POSX(x)           FFMAX(0, FFMIN(x, synth_width - 2))
-#define ODD_POSY(y)           FFMAX(0, FFMIN(y, synth_height - 2))
-#define VSYNTH_ODD_POS(x, y)  (x + ODD_POSY(y) * synth_width)
-#define HSYNTH_ODD_POS(x, y)  (ODD_POSX(x) + y * synth_width)
-
     /* Deslauriers(9,7)
        First lifting step)
        Even, predict, s=5, t_{-1}=-1, t_0=9, t_1=9, t_2=-1: