diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-01-15 19:21:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-01-15 19:21:21 +0000 |
| commit | 0e15384d9d154a1e4c5bc3a8d0f0e4618b6b5628 (patch) | |
| tree | c1041c65ed3c9afd5c23e5d48f998fe2a33be197 /libavcodec/h263.c | |
| parent | 3a87ac948f0cd95218e62d5a98b8b8d5e4c11366 (diff) | |
| download | ffmpeg-0e15384d9d154a1e4c5bc3a8d0f0e4618b6b5628.tar.gz | |
fixing DCTELEM != short
Originally committed as revision 1462 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 64b2e18bda..025288b03f 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -67,7 +67,7 @@ static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, int n, int coded, int intra); static int h263_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr); -static void mpeg4_inv_pred_ac(MpegEncContext * s, INT16 *block, int n, +static void mpeg4_inv_pred_ac(MpegEncContext * s, DCTELEM *block, int n, int dir); static void mpeg4_decode_sprite_trajectory(MpegEncContext * s); static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *dir_ptr); @@ -999,7 +999,7 @@ static int h263_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr) } -void h263_pred_acdc(MpegEncContext * s, INT16 *block, int n) +void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n) { int x, y, wrap, a, c, pred_dc, scale, i; INT16 *dc_val, *ac_val, *ac_val1; @@ -1852,7 +1852,7 @@ static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_pt return pred; } -void mpeg4_pred_ac(MpegEncContext * s, INT16 *block, int n, +void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n, int dir) { int i; @@ -1907,7 +1907,7 @@ void mpeg4_pred_ac(MpegEncContext * s, INT16 *block, int n, } -static void mpeg4_inv_pred_ac(MpegEncContext * s, INT16 *block, int n, +static void mpeg4_inv_pred_ac(MpegEncContext * s, DCTELEM *block, int n, int dir) { int i; |