diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 12:59:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 12:59:38 +0100 |
| commit | 6b8f21190d5a01ee68103f77ccef59c709c7d75e (patch) | |
| tree | 18012c9eacd646d49ef43796ab7d35fbfff01f5d /libavcodec/arm/vp8.h | |
| parent | 9fa5a47197c6ef5489b04470b8369da33db40824 (diff) | |
| parent | a0a1ac0f091d390cbbb73c90e1b6a4a18cf0f50a (diff) | |
| download | ffmpeg-6b8f21190d5a01ee68103f77ccef59c709c7d75e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxva2: Add missing #define to make header compile standalone
arm: vp8: Add missing #includes for header to compile standalone
doc: filters: Correct BNF FILTER description
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/vp8.h')
| -rw-r--r-- | libavcodec/arm/vp8.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h index 709f83d9e5..ddaa1203fd 100644 --- a/libavcodec/arm/vp8.h +++ b/libavcodec/arm/vp8.h @@ -19,7 +19,11 @@ #ifndef AVCODEC_ARM_VP8_H #define AVCODEC_ARM_VP8_H +#include <stdint.h> + #include "config.h" +#include "libavcodec/vp56.h" +#include "libavcodec/vp8.h" #if HAVE_ARMV6_EXTERNAL #define decode_block_coeffs_internal ff_decode_block_coeffs_armv6 |