diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 05:21:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 05:21:19 +0100 |
| commit | ccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59 (patch) | |
| tree | 752fdf35a10a7d2df7168f59b9d1b49fd7d01a64 /libavutil | |
| parent | f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7 (diff) | |
| parent | 8f8bc92365a943e96cc08b5369408c20f35193c7 (diff) | |
| download | ffmpeg-ccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add missing #includes for *INT64_MAX and *INT64_C
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/channel_layout.c | 2 | ||||
| -rw-r--r-- | libavutil/common.h | 1 | ||||
| -rw-r--r-- | libavutil/cpu.c | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 2b85de31d9..4c0677f794 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -23,6 +23,8 @@ * audio channel layout utility functions */ +#include <stdint.h> + #include "avstring.h" #include "avutil.h" #include "channel_layout.h" diff --git a/libavutil/common.h b/libavutil/common.h index e487218e72..c82a3a6240 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -34,6 +34,7 @@ #include <inttypes.h> #include <limits.h> #include <math.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 1dc5abb2b8..e0806b1856 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "cpu.h" #include "cpu_internal.h" #include "config.h" |