Merge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'

[ffmpeg] / libavformat / nistspheredec.c

diff --git a/libavformat/nistspheredec.c b/libavformat/nistspheredec.c
index 782d1dfbfbb94ae46124cb6c0566ff74e036dd99..55f22ebcf4f0ea052167e6ccd6c0e16ea0bb5b00 100644 (file)
--- a/libavformat/nistspheredec.c
+++ b/libavformat/nistspheredec.c
@@ -89,7 +89,7 @@ static int nist_read_header(AVFormatContext *s)
 
             return 0;
         } else if (!memcmp(buffer, "channel_count", 13)) {
-            sscanf(buffer, "%*s %*s %"SCNd32, &st->codecpar->channels);
+            sscanf(buffer, "%*s %*s %u", &st->codecpar->channels);
         } else if (!memcmp(buffer, "sample_byte_format", 18)) {
             sscanf(buffer, "%*s %*s %31s", format);
 
@@ -108,11 +108,11 @@ static int nist_read_header(AVFormatContext *s)
         } else if (!memcmp(buffer, "sample_count", 12)) {
             sscanf(buffer, "%*s %*s %"SCNd64, &st->duration);
         } else if (!memcmp(buffer, "sample_n_bytes", 14)) {
-            sscanf(buffer, "%*s %*s %"SCNd32, &bps);
+            sscanf(buffer, "%*s %*s %d", &bps);
         } else if (!memcmp(buffer, "sample_rate", 11)) {
-            sscanf(buffer, "%*s %*s %"SCNd32, &st->codecpar->sample_rate);
+            sscanf(buffer, "%*s %*s %d", &st->codecpar->sample_rate);
         } else if (!memcmp(buffer, "sample_sig_bits", 15)) {
-            sscanf(buffer, "%*s %*s %"SCNd32, &st->codecpar->bits_per_coded_sample);
+            sscanf(buffer, "%*s %*s %d", &st->codecpar->bits_per_coded_sample);
         } else {
             char key[32], value[32];
             if (sscanf(buffer, "%31s %*s %31s", key, value) == 2) {