diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-05-27 16:42:14 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-05-27 16:42:14 +0000 |
| commit | cd4af68ad54c189205175a6874f81844fa9a0ba2 (patch) | |
| tree | 31b95874aa2f0fe240b4ffd2c9c599a081ed00e7 /libavcodec/msmpeg4.c | |
| parent | c0eb0bb717eee510b47da4bccdd3307a608e034c (diff) | |
| download | ffmpeg-cd4af68ad54c189205175a6874f81844fa9a0ba2.tar.gz | |
* started to cleanup name clashes for onetime compilation
Originally committed as revision 617 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 369e042de5..ea744b3609 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -934,7 +934,7 @@ int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size) return 0; } -static inline void memsetw(short *tab, int val, int n) +static inline void msmpeg4_memsetw(short *tab, int val, int n) { int i; for(i=0;i<n;i++) @@ -1074,23 +1074,23 @@ int msmpeg4_decode_mb(MpegEncContext *s, int wrap; /* reset DC pred (set previous line to 1024) */ wrap = 2 * s->mb_width + 2; - memsetw(&s->dc_val[0][(1) + (2 * s->mb_y) * wrap], - 1024, 2 * s->mb_width); - wrap = s->mb_width + 2; - memsetw(&s->dc_val[1][(1) + (s->mb_y) * wrap], - 1024, s->mb_width); - memsetw(&s->dc_val[2][(1) + (s->mb_y) * wrap], - 1024, s->mb_width); - - /* reset AC pred (set previous line to 0) */ - wrap = s->mb_width * 2 + 2; - memsetw(s->ac_val[0][0] + (1 + (2 * s->mb_y) * wrap)*16, - 0, 2 * s->mb_width*16); - wrap = s->mb_width + 2; - memsetw(s->ac_val[1][0] + (1 + (s->mb_y) * wrap)*16, - 0, s->mb_width*16); - memsetw(s->ac_val[2][0] + (1 + (s->mb_y) * wrap)*16, - 0, s->mb_width*16); + msmpeg4_memsetw(&s->dc_val[0][(1) + (2 * s->mb_y) * wrap], + 1024, 2 * s->mb_width); + wrap = s->mb_width + 2; + msmpeg4_memsetw(&s->dc_val[1][(1) + (s->mb_y) * wrap], + 1024, s->mb_width); + msmpeg4_memsetw(&s->dc_val[2][(1) + (s->mb_y) * wrap], + 1024, s->mb_width); + + /* reset AC pred (set previous line to 0) */ + wrap = s->mb_width * 2 + 2; + msmpeg4_memsetw(s->ac_val[0][0] + (1 + (2 * s->mb_y) * wrap)*16, + 0, 2 * s->mb_width*16); + wrap = s->mb_width + 2; + msmpeg4_memsetw(s->ac_val[1][0] + (1 + (s->mb_y) * wrap)*16, + 0, s->mb_width*16); + msmpeg4_memsetw(s->ac_val[2][0] + (1 + (s->mb_y) * wrap)*16, + 0, s->mb_width*16); s->first_slice_line = 1; } else { |