* qatar/master: configure: spelling cosmetics dctref: make sure function declarations match between .c and .h file x86: fix build with gcc 4.7 Conflicts: configure
Showing the changes to libavcodec/dctref.h (1 of 2 files). Show all
Unified · Split
| @@ -22,10 +22,8 @@ · 21 unmodified lines | ||
| 22 | 22 | #ifndef AVCODEC_DCTREF_H |
| 23 | 23 | #define AVCODEC_DCTREF_H |
| 24 | 24 | |
| 25 | −#include "dsputil.h" | |
| 26 | − | |
| 27 | −void ff_ref_fdct(DCTELEM *block); | |
| 28 | −void ff_ref_idct(DCTELEM *block); | |
| 25 | +void ff_ref_fdct(short *block); | |
| 26 | +void ff_ref_idct(short *block); | |
| 29 | 27 | void ff_ref_dct_init(void); |
| 30 | 28 | |
| 31 | 29 | #endif /* AVCODEC_DCTREF_H */ |