diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-31 13:55:34 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-31 13:55:38 +0200 |
commit | 4fa00c567cd561f55e839ff187783c79a9ccae78 (patch) | |
tree | aacedc945b5d17e89ec75683c7df2226653715f3 /libavcodec | |
parent | b043d80be4d8d1a5d16f3e864ebff3a4bbe9c509 (diff) | |
parent | b970f85564ba6b5c17a8d642bb8161119011e7bd (diff) |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix make checkheaders for wavpackenc.h
Fix make checkheaders for vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/vdpau_internal.h | 1 | ||||
-rw-r--r-- | libavcodec/wavpack.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 7fdfda0457..b6701f30db 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -24,6 +24,7 @@ #ifndef AVCODEC_VDPAU_INTERNAL_H #define AVCODEC_VDPAU_INTERNAL_H +#include "config.h" #include <stdint.h> #if CONFIG_VDPAU #include <vdpau/vdpau.h> diff --git a/libavcodec/wavpack.h b/libavcodec/wavpack.h index bca6c4550e..081b7f714d 100644 --- a/libavcodec/wavpack.h +++ b/libavcodec/wavpack.h @@ -22,6 +22,8 @@ #ifndef AVCODEC_WAVPACK_H #define AVCODEC_WAVPACK_H +#include "libavutil/common.h" + #define MAX_TERMS 16 #define MAX_TERM 8 |