diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 02:54:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 02:54:09 +0200 |
| commit | 45ba9d8545829e9c3df1b57de0b00256d8eddaac (patch) | |
| tree | f0c37254e7988fae6ddf702f99da0cf7dac9a2bf /libavformat | |
| parent | 119cf2a44b124ac5ed749589a78233272f4101a1 (diff) | |
| parent | cba4e6062a02d5bf684e13a770be88aa1fec717e (diff) | |
Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
More correct printf format specifiers
Conflicts:
libavcodec/h264_ps.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | libavformat/movenc.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 75a05b85ef..e025133266 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1523,7 +1523,7 @@ static int mov_rewrite_dvd_sub_extradata(AVStream *st) uint32_t yuv = AV_RB32(src + i * 4); uint32_t rgba = yuv_to_rgba(yuv); - av_strlcatf(buf, sizeof(buf), "%06x%s", rgba, i != 15 ? ", " : ""); + av_strlcatf(buf, sizeof(buf), "%06"PRIx32"%s", rgba, i != 15 ? ", " : ""); } if (av_strlcat(buf, "\n", sizeof(buf)) >= sizeof(buf)) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 14065ede36..94acc941b3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -22,6 +22,7 @@ */ #include <stdint.h> +#include <inttypes.h> #include "movenc.h" #include "avformat.h" @@ -3787,8 +3788,10 @@ static int mov_create_dvd_sub_decoder_specific_info(MOVTrack *track, if (strncmp("palette:", cur, 8) == 0) { int i, count; count = sscanf(cur + 8, - "%06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, " - "%06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x", + "%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32", " + "%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32", " + "%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32", " + "%06"PRIx32", %06"PRIx32", %06"PRIx32", %06"PRIx32"", &palette[ 0], &palette[ 1], &palette[ 2], &palette[ 3], &palette[ 4], &palette[ 5], &palette[ 6], &palette[ 7], &palette[ 8], &palette[ 9], &palette[10], &palette[11], |