diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-22 12:06:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-22 12:06:47 +0100 |
| commit | b7f8e6dd8c26207213c7d1a74308b1c8dc84e92a (patch) | |
| tree | a9279303ecde6c68fb82c8c98f90c24bed980f5a | |
| parent | 526f7ef2110811f3b8d116e80ef29cae3b30bc2d (diff) | |
| parent | 3a724a7f3ba7fa766c6a6f0924a15cc742031b8d (diff) | |
| download | ffmpeg-b7f8e6dd8c26207213c7d1a74308b1c8dc84e92a.tar.gz | |
Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'
* commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d':
dashenc: Use inttypes.h macros for format strings instead of %lld
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/dashenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index d7b2583b0c..8b6be7133e 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -282,7 +282,7 @@ static DASHTmplId dash_read_tmpl_id(const char *identifier, char *format_tag, // next parse the dash format-tag and generate a c-string format tag // (next_ptr now points at the first '%' at the beginning of the format-tag) if (id_type != DASH_TMPL_ID_UNDEFINED) { - const char *number_format = (id_type == DASH_TMPL_ID_TIME) ? "lld" : "d"; + const char *number_format = (id_type == DASH_TMPL_ID_TIME) ? PRId64 : "d"; if (next_ptr[0] == '$') { // no dash format-tag snprintf(format_tag, format_tag_size, "%%%s", number_format); *ptr = &next_ptr[1]; |