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 /libavformat/assdec.c | |
| 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 'libavformat/assdec.c')
| -rw-r--r-- | libavformat/assdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/assdec.c b/libavformat/assdec.c index 35fcb519c1..c9bd63b3c4 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "avformat.h" #include "internal.h" #include "subtitles.h" |