diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-03 17:41:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-03 17:41:17 +0200 |
| commit | b0dc4286a960a8a6e87ef7904006f7948a5af6b0 (patch) | |
| tree | d1d90bc46d022d4cb070f9f7696712d3a66c0e12 /libavcodec/intrax8dsp.h | |
| parent | 5d5583038866cbc2280b893c39e1885d77fdf243 (diff) | |
| parent | eb239a577fcf1f19cdaa7aeb6e6586a172ee59c1 (diff) | |
| download | ffmpeg-b0dc4286a960a8a6e87ef7904006f7948a5af6b0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: avcodec: order cosmetics
intrax8dsp: Add missing #include to make header standalone
Delete motion-test tool; it is of doubtful utility.
Conflicts:
libavcodec/Makefile
libavcodec/motion-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/intrax8dsp.h')
| -rw-r--r-- | libavcodec/intrax8dsp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/intrax8dsp.h b/libavcodec/intrax8dsp.h index 669b04f016..1e4a3af881 100644 --- a/libavcodec/intrax8dsp.h +++ b/libavcodec/intrax8dsp.h @@ -19,6 +19,8 @@ #ifndef AVCODEC_INTRAX8DSP_H #define AVCODEC_INTRAX8DSP_H +#include <stdint.h> + typedef struct IntraX8DSPContext { void (*v_loop_filter)(uint8_t *src, int stride, int qscale); void (*h_loop_filter)(uint8_t *src, int stride, int qscale); |