Mercurial > libavcodec.hg
comparison ac3enc.c @ 9142:8b977d664424 libavcodec
Remove duplicated MUL16 macro definition, fixes the warning:
libavcodec/ac3enc.c:119:1: warning: "MUL16" redefined
author | diego |
---|---|
date | Thu, 05 Mar 2009 22:17:12 +0000 |
parents | 043574c5c153 |
children | 4cb7c65fc775 |
comparison
equal
deleted
inserted
replaced
9141:489def16f0c7 | 9142:8b977d664424 |
---|---|
113 pre = (bx + ax) >> 1;\ | 113 pre = (bx + ax) >> 1;\ |
114 pim = (by + ay) >> 1;\ | 114 pim = (by + ay) >> 1;\ |
115 qre = (bx - ax) >> 1;\ | 115 qre = (bx - ax) >> 1;\ |
116 qim = (by - ay) >> 1;\ | 116 qim = (by - ay) >> 1;\ |
117 } | 117 } |
118 | |
119 #define MUL16(a,b) ((a) * (b)) | |
120 | 118 |
121 #define CMUL(pre, pim, are, aim, bre, bim) \ | 119 #define CMUL(pre, pim, are, aim, bre, bim) \ |
122 {\ | 120 {\ |
123 pre = (MUL16(are, bre) - MUL16(aim, bim)) >> 15;\ | 121 pre = (MUL16(are, bre) - MUL16(aim, bim)) >> 15;\ |
124 pim = (MUL16(are, bim) + MUL16(bre, aim)) >> 15;\ | 122 pim = (MUL16(are, bim) + MUL16(bre, aim)) >> 15;\ |