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 /libavfilter | |
| parent | f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7 (diff) | |
| parent | 8f8bc92365a943e96cc08b5369408c20f35193c7 (diff) | |
| download | ffmpeg-streaming-ccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59.zip ffmpeg-streaming-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 'libavfilter')
| -rw-r--r-- | libavfilter/af_asyncts.c | 2 | ||||
| -rw-r--r-- | libavfilter/src_movie.c | 1 | ||||
| -rw-r--r-- | libavfilter/trim.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_fps.c | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index dc8805c..5f8e1f6 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavresample/avresample.h" #include "libavutil/attributes.h" #include "libavutil/audio_fifo.h" diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 5bec10f..d1289e2 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -28,6 +28,7 @@ */ #include <float.h> +#include <stdint.h> #include "libavutil/attributes.h" #include "libavutil/avstring.h" diff --git a/libavfilter/trim.c b/libavfilter/trim.c index fdc6245..04e82da 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -18,6 +18,7 @@ #include <float.h> #include <math.h> +#include <stdint.h> #include "config.h" diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 1d1b947..e6266cc 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -26,6 +26,7 @@ */ #include <float.h> +#include <stdint.h> #include "libavutil/common.h" #include "libavutil/fifo.h" |
