diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2007-05-30 09:32:25 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2007-05-30 09:32:25 +0000 |
| commit | 154e30f6c2f67317fa9ab2745ed58716a9c47cc8 (patch) | |
| tree | 97189f4b7b599e5a5d5e3ebd308dcfb787608250 /libavcodec/h264.c | |
| parent | 9f6c879365f9f57b941a48c01fd2f9d8790508e3 (diff) | |
| download | ffmpeg-154e30f6c2f67317fa9ab2745ed58716a9c47cc8.tar.gz | |
rename attribute_unused to av_unused and moves its declaration to common.h
patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM
Originally committed as revision 9155 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1041b32c54..ab61a8c38f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1733,22 +1733,22 @@ static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ #define LOAD_TOP_RIGHT_EDGE\ - const int attribute_unused t4= topright[0];\ - const int attribute_unused t5= topright[1];\ - const int attribute_unused t6= topright[2];\ - const int attribute_unused t7= topright[3];\ + const int av_unused t4= topright[0];\ + const int av_unused t5= topright[1];\ + const int av_unused t6= topright[2];\ + const int av_unused t7= topright[3];\ #define LOAD_LEFT_EDGE\ - const int attribute_unused l0= src[-1+0*stride];\ - const int attribute_unused l1= src[-1+1*stride];\ - const int attribute_unused l2= src[-1+2*stride];\ - const int attribute_unused l3= src[-1+3*stride];\ + const int av_unused l0= src[-1+0*stride];\ + const int av_unused l1= src[-1+1*stride];\ + const int av_unused l2= src[-1+2*stride];\ + const int av_unused l3= src[-1+3*stride];\ #define LOAD_TOP_EDGE\ - const int attribute_unused t0= src[ 0-1*stride];\ - const int attribute_unused t1= src[ 1-1*stride];\ - const int attribute_unused t2= src[ 2-1*stride];\ - const int attribute_unused t3= src[ 3-1*stride];\ + const int av_unused t0= src[ 0-1*stride];\ + const int av_unused t1= src[ 1-1*stride];\ + const int av_unused t2= src[ 2-1*stride];\ + const int av_unused t3= src[ 3-1*stride];\ static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ const int lt= src[-1-1*stride]; @@ -2159,7 +2159,7 @@ void ff_pred8x8_plane_c(uint8_t *src, int stride){ const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \ + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \ PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \ - const int l7 attribute_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2 + const int l7 av_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2 #define PT(x) \ const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; @@ -2167,7 +2167,7 @@ void ff_pred8x8_plane_c(uint8_t *src, int stride){ const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \ + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \ PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \ - const int t7 attribute_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \ + const int t7 av_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \ + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2 #define PTR(x) \ |