diff --git a/doc/APIchanges b/doc/APIchanges
index 958035ce777d8d5af4d03a7c34fff7f58ec08a96..e5cd3e43b7c4305aa9ca960719d85c828a6eec08 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,10 @@ libavutil: 2015-08-28
API changes, most recent first:
+2015-09-15 - lavc 57.2.100 - avcodec.h
+ bit_rate/rc_max_rate/rc_min_rate were changed to 64bit, make sure you update
+ any printf() or other type sensitive code
+
2015-xx-xx - lavu 55.0.100 / lavu 55.0.0
xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t.
xxxxxxx - Change type of AVComponentDescriptor fields from uint16_t to int
diff --git a/ffserver.c b/ffserver.c
index 73ede871abbf0fe6df27a82599406c27a09cbf5c..f9e40b54fd6ab5ff893f7e58cf43bc45286f51b5 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1787,9 +1787,9 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream)
abort();
}
- avio_printf(pb, "<tr><td align=right>%d<td>%s<td align=right>%d"
+ avio_printf(pb, "<tr><td align=right>%d<td>%s<td align=right>%"PRId64
"<td>%s<td>%s\n",
- i, type, st->codec->bit_rate/1000,
+ i, type, (int64_t)st->codec->bit_rate/1000,
codec ? codec->name : "", parameters);
}
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6e3edaaed7b4169569e093fc68a6b03b18bc35dd..aac51985f0cb2accf4be6ce1cffacb04df56cdef 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1532,7 +1532,11 @@ typedef struct AVCodecContext {
* - decoding: Set by user, may be overwritten by libavcodec
* if this info is available in the stream
*/
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
int bit_rate;
+#else
+ int64_t bit_rate;
+#endif
/**
* number of bits the bitstream is allowed to diverge from the reference.
@@ -2463,14 +2467,22 @@ typedef struct AVCodecContext {
* - encoding: Set by user.
* - decoding: Set by user, may be overwritten by libavcodec.
*/
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
int rc_max_rate;
+#else
+ int64_t rc_max_rate;
+#endif
/**
* minimum bitrate
* - encoding: Set by user.
* - decoding: unused
*/
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
int rc_min_rate;
+#else
+ int64_t rc_min_rate;
+#endif
#if FF_API_MPV_OPT
/**
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 673896d6cdef74133d7eb69af403db4cd92ce72b..d8fb7368281306cb87f8b05a256b3e633cab093e 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1028,7 +1028,7 @@ static void dump_cook_context(COOKContext *q)
}
ff_dlog(q->avctx, "COOKContext\n");
PRINT("nb_channels", q->avctx->channels);
- PRINT("bit_rate", q->avctx->bit_rate);
+ PRINT("bit_rate", (int)q->avctx->bit_rate);
PRINT("sample_rate", q->avctx->sample_rate);
PRINT("samples_per_channel", q->subpacket[0].samples_per_channel);
PRINT("subbands", q->subpacket[0].subbands);
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index 23587a7bd7da151aaac1aae1fe82d2dafe5fb642..79da8f4289082dfdeb4dc6bf853145b82985a601 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -145,7 +145,7 @@ static int encode_init(AVCodecContext *avctx)
c->samplerate_index = i;
if (avctx->bit_rate < 32000 || avctx->bit_rate > 3840000) {
- av_log(avctx, AV_LOG_ERROR, "Bit rate %i not supported.", avctx->bit_rate);
+ av_log(avctx, AV_LOG_ERROR, "Bit rate %"PRId64" not supported.", (int64_t)avctx->bit_rate);
return AVERROR(EINVAL);
}
for (i = 0; ff_dca_bit_rates[i] < avctx->bit_rate; i++)
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 5df0c90947451b40e6d9c8fd19f69a468a7952ff..98a817b537e273baa2b94b3910d723483714d3f8 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -215,8 +215,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
}
if ((err = aacEncoder_SetParam(s->handle, AACENC_BITRATE,
avctx->bit_rate)) != AACENC_OK) {
- av_log(avctx, AV_LOG_ERROR, "Unable to set the bitrate %d: %s\n",
- avctx->bit_rate, aac_get_error(err));
+ av_log(avctx, AV_LOG_ERROR, "Unable to set the bitrate %"PRId64": %s\n",
+ (int64_t)avctx->bit_rate, aac_get_error(err));
goto error;
}
}
diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c
index 45fdb8edd6b9235befefceaddf84ebe85b27a872..69ce439ec1db88316288e27b7704b6360ce54158 100644
--- a/libavcodec/libgsmenc.c
+++ b/libavcodec/libgsmenc.c
@@ -62,8 +62,8 @@ static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
if (avctx->bit_rate != 13000 /* Official */ &&
avctx->bit_rate != 13200 /* Very common */ &&
avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
- av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
- avctx->bit_rate);
+ av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %"PRId64"bps\n",
+ (int64_t)avctx->bit_rate);
if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
return -1;
}
diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c
index a170b711c6f79b6df0111e7d1d30dcea5e64ea61..8ac02f95205bdfa37bfa719e73c0cf8ed5f68f72 100644
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@@ -180,12 +180,12 @@ static av_cold int libopus_encode_init(AVCodecContext *avctx)
avctx->bit_rate = 64000 * opus->stream_count +
32000 * coupled_stream_count;
av_log(avctx, AV_LOG_WARNING,
- "No bit rate set. Defaulting to %d bps.\n", avctx->bit_rate);
+ "No bit rate set. Defaulting to %"PRId64" bps.\n", (int64_t)avctx->bit_rate);
}
if (avctx->bit_rate < 500 || avctx->bit_rate > 256000 * avctx->channels) {
- av_log(avctx, AV_LOG_ERROR, "The bit rate %d bps is unsupported. "
- "Please choose a value between 500 and %d.\n", avctx->bit_rate,
+ av_log(avctx, AV_LOG_ERROR, "The bit rate %"PRId64" bps is unsupported. "
+ "Please choose a value between 500 and %d.\n", (int64_t)avctx->bit_rate,
256000 * avctx->channels);
return AVERROR(EINVAL);
}
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c
index fbc17388a17868e21e7221efe41911aefb62f1f8..65a84dc56d26a999a39d05d5074c72a5f27d7b80 100644
--- a/libavcodec/libspeexenc.c
+++ b/libavcodec/libspeexenc.c
@@ -125,10 +125,10 @@ static av_cold void print_enc_params(AVCodecContext *avctx,
av_log(avctx, AV_LOG_DEBUG, " quality: %f\n", s->vbr_quality);
} else if (s->abr) {
av_log(avctx, AV_LOG_DEBUG, "rate control: ABR\n");
- av_log(avctx, AV_LOG_DEBUG, " bitrate: %d bps\n", avctx->bit_rate);
+ av_log(avctx, AV_LOG_DEBUG, " bitrate: %"PRId64" bps\n", (int64_t)avctx->bit_rate);
} else {
av_log(avctx, AV_LOG_DEBUG, "rate control: CBR\n");
- av_log(avctx, AV_LOG_DEBUG, " bitrate: %d bps\n", avctx->bit_rate);
+ av_log(avctx, AV_LOG_DEBUG, " bitrate: %"PRId64" bps\n", (int64_t)avctx->bit_rate);
}
av_log(avctx, AV_LOG_DEBUG, "complexity: %d\n",
avctx->compression_level);
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index b04fa39bc798a17e6b71ee6ed210c7c0b2263a93..b84eba1602879f51c1f944b74a431cc95e5910fd 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -486,7 +486,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
avctx->bit_rate * av_q2d(avctx->time_base) >
avctx->bit_rate_tolerance) {
av_log(avctx, AV_LOG_WARNING,
- "bitrate tolerance %d too small for bitrate %d, overriding\n", avctx->bit_rate_tolerance, avctx->bit_rate);
+ "bitrate tolerance %d too small for bitrate %"PRId64", overriding\n", avctx->bit_rate_tolerance, (int64_t)avctx->bit_rate);
avctx->bit_rate_tolerance = 5 * avctx->bit_rate * av_q2d(avctx->time_base);
}
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index d6a5c69ac4bac26049800cb799b1aedddd92daa4..1150841953304152c6083827a8681766e89cec36 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -42,8 +42,13 @@
#define AV_CODEC_DEFAULT_BITRATE 200*1000
static const AVOption avcodec_options[] = {
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT_MAX, A|V|E},
{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = 128*1000 }, 0, INT_MAX, A|E},
+#else
+{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT_MAX, A|V|E},
+{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = 128*1000 }, 0, INT_MAX, A|E},
+#endif
{"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far "
"ratecontrol is willing to deviate from the target average bitrate value. This is not related "
"to minimum/maximum bitrate. Lowering tolerance too much has an adverse effect on quality.",
@@ -186,9 +191,15 @@ static const AVOption avcodec_options[] = {
#if FF_API_MPV_OPT
{"rc_eq", "deprecated, use encoder private options instead", OFFSET(rc_eq), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, V|E},
#endif
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
{"maxrate", "maximum bitrate (in bits/s). Used for VBV together with bufsize.", OFFSET(rc_max_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|A|E},
{"minrate", "minimum bitrate (in bits/s). Most useful in setting up a CBR encode. It is of little use otherwise.",
OFFSET(rc_min_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
+#else
+{"maxrate", "maximum bitrate (in bits/s). Used for VBV together with bufsize.", OFFSET(rc_max_rate), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT_MAX, V|A|E},
+{"minrate", "minimum bitrate (in bits/s). Most useful in setting up a CBR encode. It is of little use otherwise.",
+ OFFSET(rc_min_rate), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
+#endif
{"bufsize", "set ratecontrol buffer size (in bits)", OFFSET(rc_buffer_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|V|E},
#if FF_API_MPV_OPT
{"rc_buf_aggressivity", "deprecated, use encoder private options instead", OFFSET(rc_buffer_aggressivity), AV_OPT_TYPE_FLOAT, {.dbl = 1.0 }, -FLT_MAX, FLT_MAX, V|E},
diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c
index e7f9ee44a19dbcb591522823cc3485dd768527ab..22c1c08bcf1502adc4154aa79101e95aef3b4811 100644
--- a/libavcodec/pcm-bluray.c
+++ b/libavcodec/pcm-bluray.c
@@ -117,9 +117,9 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx,
if (avctx->debug & FF_DEBUG_PICT_INFO)
ff_dlog(avctx,
- "pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
+ "pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %"PRId64" bit/s\n",
avctx->channels, avctx->bits_per_coded_sample,
- avctx->sample_rate, avctx->bit_rate);
+ avctx->sample_rate, (int64_t)avctx->bit_rate);
return 0;
}
diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c
index 985a19bdb196d0f3a6238b02e7c766354e01de89..a78c05dbe230265a8e3949afe0e3b2d4054b1a56 100644
--- a/libavcodec/pcm-dvd.c
+++ b/libavcodec/pcm-dvd.c
@@ -140,9 +140,9 @@ static int pcm_dvd_parse_header(AVCodecContext *avctx, const uint8_t *header)
if (avctx->debug & FF_DEBUG_PICT_INFO)
ff_dlog(avctx,
- "pcm_dvd_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
+ "pcm_dvd_parse_header: %d channels, %d bits per sample, %d Hz, %"PRId64" bit/s\n",
avctx->channels, avctx->bits_per_coded_sample,
- avctx->sample_rate, avctx->bit_rate);
+ avctx->sample_rate, (int64_t)avctx->bit_rate);
s->last_header = header_int;
diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index eb8b471263b1a3bd5c936897ef08b0c46f91dafe..4602a42484898bc1e1c0f157aa1652fe030493cc 100644
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -493,8 +493,8 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx)
else if (avctx->bit_rate > 5750 ) ctx->mode = MODE_6k5;
else ctx->mode = MODE_5k0;
av_log(avctx, AV_LOG_WARNING,
- "Invalid block_align: %d. Mode %s guessed based on bitrate: %d\n",
- avctx->block_align, modes[ctx->mode].mode_name, avctx->bit_rate);
+ "Invalid block_align: %d. Mode %s guessed based on bitrate: %"PRId64"\n",
+ avctx->block_align, modes[ctx->mode].mode_name, (int64_t)avctx->bit_rate);
}
av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name);
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 3e4cea531af117aeb3dd721122c0c69996784cef..ababdf3cfe50e53de5f8add7809ecf60ba4d8120 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1450,7 +1450,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
if ( (avctx->codec_type == AVMEDIA_TYPE_VIDEO || avctx->codec_type == AVMEDIA_TYPE_AUDIO)
&& avctx->bit_rate>0 && avctx->bit_rate<1000) {
- av_log(avctx, AV_LOG_WARNING, "Bitrate %d is extremely low, maybe you mean %dk\n", avctx->bit_rate, avctx->bit_rate);
+ av_log(avctx, AV_LOG_WARNING, "Bitrate %"PRId64" is extremely low, maybe you mean %"PRId64"k\n", (int64_t)avctx->bit_rate, (int64_t)avctx->bit_rate);
}
if (!avctx->rc_initial_buffer_occupancy)
@@ -2828,7 +2828,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
", %d kb/s", bitrate / 1000);
} else if (enc->rc_max_rate > 0) {
snprintf(buf + strlen(buf), buf_size - strlen(buf),
- ", max. %d kb/s", enc->rc_max_rate / 1000);
+ ", max. %"PRId64" kb/s", (int64_t)enc->rc_max_rate / 1000);
}
}
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d233c712cfe5b1b233bbe20e04a9febc05eaf7ac..07a9070d0178d76ea9753a2530d0fcdce138d8ec 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 1
+#define LIBAVCODEC_VERSION_MINOR 2
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index 006d8d55e4551053a91e010152d0ad2c64f97da7..6d1c7e5c2f141ad97c3668659152fefa1f3ae63f 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -185,8 +185,8 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
high_freq = high_freq * 0.5;
}
ff_dlog(s->avctx, "flags2=0x%x\n", flags2);
- ff_dlog(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
- s->version, avctx->channels, avctx->sample_rate, avctx->bit_rate,
+ ff_dlog(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%"PRId64" block_align=%d\n",
+ s->version, avctx->channels, avctx->sample_rate, (int64_t)avctx->bit_rate,
avctx->block_align);
ff_dlog(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
bps, bps1, high_freq, s->byte_offset_bits);
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index fc23d4e33dc3a2e583111fbe6895d0e74d614c61..faf0cb518d9ad77bac97569f3776ea84eb45ea61 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -50,8 +50,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (avctx->bit_rate < 24 * 1000) {
av_log(avctx, AV_LOG_ERROR,
- "bitrate too low: got %i, need 24000 or higher\n",
- avctx->bit_rate);
+ "bitrate too low: got %"PRId64", need 24000 or higher\n",
+ (int64_t)avctx->bit_rate);
return AVERROR(EINVAL);
}
diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c
index c1e946a5646d49641bdeb2ed2446eeba998934e8..e9a3639391f0842dc17397f5f9fab6be3b0b6763 100644
--- a/libavdevice/fbdev_dec.c
+++ b/libavdevice/fbdev_dec.c
@@ -136,11 +136,11 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx)
fbdev->width * fbdev->height * fbdev->bytes_per_pixel * av_q2d(fbdev->framerate_q) * 8;
av_log(avctx, AV_LOG_INFO,
- "w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%d\n",
+ "w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%"PRId64"\n",
fbdev->width, fbdev->height, fbdev->varinfo.bits_per_pixel,
av_get_pix_fmt_name(pix_fmt),
fbdev->framerate_q.num, fbdev->framerate_q.den,
- st->codec->bit_rate);
+ (int64_t)st->codec->bit_rate);
return 0;
fail:
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 08d0c2a77203a3df30f84061c57037917b66e4f2..af03d1e4bb1edb80740a3439b59349b3ea19db48 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3296,8 +3296,8 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov)
} else {
continue;
}
- avio_printf(pb, "<%s systemBitrate=\"%d\">\n", type,
- track->enc->bit_rate);
+ avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type,
+ (int64_t)track->enc->bit_rate);
param_write_int(pb, "systemBitrate", track->enc->bit_rate);
param_write_int(pb, "trackID", track_id);
if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) {
diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index 046d2732a477a6ca859df73d073de4059d6d978a..0e6ac8ec76eb7059512ef56a04ca2f40ca304cca 100644
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -448,7 +448,11 @@ real_parse_asm_rule(AVStream *st, const char *p, const char *end)
{
do {
/* can be either averagebandwidth= or AverageBandwidth= */
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
if (sscanf(p, " %*1[Aa]verage%*1[Bb]andwidth=%d", &st->codec->bit_rate) == 1)
+#else
+ if (sscanf(p, " %*1[Aa]verage%*1[Bb]andwidth=%"SCNd64, &st->codec->bit_rate) == 1)
+#endif
break;
if (!(p = strchr(p, ',')) || p > end)
p = end;
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 45974b394fbde4a9cfc1a1b1c1fa88fd83307614..2ab37a8f5e3db093d2d407ef37645805b20db78c 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -740,7 +740,7 @@ void ff_sdp_write_media(char *buff, int size, AVStream *st, int idx,
av_strlcatf(buff, size, "m=%s %d RTP/AVP %d\r\n", type, port, payload_type);
sdp_write_address(buff, size, dest_addr, dest_type, ttl);
if (c->bit_rate) {
- av_strlcatf(buff, size, "b=AS:%d\r\n", c->bit_rate / 1000);
+ av_strlcatf(buff, size, "b=AS:%"PRId64"\r\n", (int64_t)c->bit_rate / 1000);
}
sdp_write_media_attributes(buff, size, c, payload_type, fmt);
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 07173a96f90a0f135728c6cb31fab36bcadbabe1..1ae3b49cf5cebad61e4c68dde90cda966cba7b3f 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -260,7 +260,7 @@ static int write_manifest(AVFormatContext *s, int final)
if (s->streams[i]->codec->codec_type != AVMEDIA_TYPE_VIDEO)
continue;
last = i;
- avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%d\" FourCC=\"%s\" MaxWidth=\"%d\" MaxHeight=\"%d\" CodecPrivateData=\"%s\" />\n", index, s->streams[i]->codec->bit_rate, os->fourcc, s->streams[i]->codec->width, s->streams[i]->codec->height, os->private_str);
+ avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%"PRId64"\" FourCC=\"%s\" MaxWidth=\"%d\" MaxHeight=\"%d\" CodecPrivateData=\"%s\" />\n", index, (int64_t)s->streams[i]->codec->bit_rate, os->fourcc, s->streams[i]->codec->width, s->streams[i]->codec->height, os->private_str);
index++;
}
output_chunk_list(&c->streams[last], out, final, c->lookahead_count, c->window_size);
@@ -274,7 +274,7 @@ static int write_manifest(AVFormatContext *s, int final)
if (s->streams[i]->codec->codec_type != AVMEDIA_TYPE_AUDIO)
continue;
last = i;
- avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%d\" FourCC=\"%s\" SamplingRate=\"%d\" Channels=\"%d\" BitsPerSample=\"16\" PacketSize=\"%d\" AudioTag=\"%d\" CodecPrivateData=\"%s\" />\n", index, s->streams[i]->codec->bit_rate, os->fourcc, s->streams[i]->codec->sample_rate, s->streams[i]->codec->channels, os->packet_size, os->audio_tag, os->private_str);
+ avio_printf(out, "<QualityLevel Index=\"%d\" Bitrate=\"%"PRId64"\" FourCC=\"%s\" SamplingRate=\"%d\" Channels=\"%d\" BitsPerSample=\"16\" PacketSize=\"%d\" AudioTag=\"%d\" CodecPrivateData=\"%s\" />\n", index, (int64_t)s->streams[i]->codec->bit_rate, os->fourcc, s->streams[i]->codec->sample_rate, s->streams[i]->codec->channels, os->packet_size, os->audio_tag, os->private_str);
index++;
}
output_chunk_list(&c->streams[last], out, final, c->lookahead_count, c->window_size);
@@ -321,7 +321,7 @@ static int ism_write_header(AVFormatContext *s)
ret = AVERROR(EINVAL);
goto fail;
}
- snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%d)", s->filename, s->streams[i]->codec->bit_rate);
+ snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%"PRId64")", s->filename, (int64_t)s->streams[i]->codec->bit_rate);
if (mkdir(os->dirname, 0777) == -1 && errno != EEXIST) {
ret = AVERROR(errno);
av_log(s, AV_LOG_ERROR, "mkdir failed\n");
diff --git a/libavformat/vqf.c b/libavformat/vqf.c
index 29c726dae92201397243d488bc4ede778461b347..06363a963cc2ce1d1c2d7027459d87a3afb32c69 100644
--- a/libavformat/vqf.c
+++ b/libavformat/vqf.c
@@ -211,8 +211,8 @@ static int vqf_read_header(AVFormatContext *s)
size = 2048;
break;
default:
- av_log(s, AV_LOG_ERROR, "Mode not suported: %d Hz, %d kb/s.\n",
- st->codec->sample_rate, st->codec->bit_rate);
+ av_log(s, AV_LOG_ERROR, "Mode not suported: %d Hz, %"PRId64" kb/s.\n",
+ st->codec->sample_rate, (int64_t)st->codec->bit_rate);
return -1;
}
c->frame_bit_len = st->codec->bit_rate*size/st->codec->sample_rate;