diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 04:12:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 04:12:26 +0100 |
| commit | 67dbf8bec977571120f2c70c60ea637fa8916dd6 (patch) | |
| tree | a5c56d4bb919d298ade11ab4e4a51e00065a3caa | |
| parent | c724c82a78284368e8542630ce602bc591bb95c8 (diff) | |
| parent | 20f3cdf0c894a874fad5d76358fde6294acedeed (diff) | |
| download | ffmpeg-67dbf8bec977571120f2c70c60ea637fa8916dd6.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Include config.h from huffyuvdsp.h.
Include stddef from snow_dwt.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/huffyuvdsp.h | 1 | ||||
| -rw-r--r-- | libavcodec/snow_dwt.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/huffyuvdsp.h b/libavcodec/huffyuvdsp.h index 78b2bca135..db377289ee 100644 --- a/libavcodec/huffyuvdsp.h +++ b/libavcodec/huffyuvdsp.h @@ -20,6 +20,7 @@ #define AVCODEC_HUFFYUVDSP_H #include <stdint.h> +#include "config.h" #if HAVE_BIGENDIAN #define B 3 diff --git a/libavcodec/snow_dwt.h b/libavcodec/snow_dwt.h index 6ac49e2b9e..e2d7528056 100644 --- a/libavcodec/snow_dwt.h +++ b/libavcodec/snow_dwt.h @@ -21,6 +21,7 @@ #ifndef AVCODEC_SNOW_DWT_H #define AVCODEC_SNOW_DWT_H +#include <stddef.h> #include <stdint.h> typedef int DWTELEM; |