RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/utils: Correctly show bit_rate >INT_MAX. 

Fixes ticket #2089.
This commit is contained in:
Carl Eugen Hoyos 2015-09-15 20:56:23 +02:00
parent 72db5e96fc
commit 040ddd27bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/utils.c
View File

@ -1118,9 +1118,9 @@ static void get_subtitle_defaults(AVSubtitle *sub)
sub->pts = AV_NOPTS_VALUE; sub->pts = AV_NOPTS_VALUE;
} }
static int get_bit_rate(AVCodecContext *ctx) static int64_t get_bit_rate(AVCodecContext *ctx)
{ {
int bit_rate; int64_t bit_rate;
int bits_per_sample; int bits_per_sample;
switch (ctx->codec_type) { switch (ctx->codec_type) {
@ -2653,7 +2653,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
const char *codec_name; const char *codec_name;
const char *profile = NULL; const char *profile = NULL;
const AVCodec *p; const AVCodec *p;
int bitrate; int64_t bitrate;
int new_line = 0; int new_line = 0;
AVRational display_aspect_ratio; AVRational display_aspect_ratio;
const char *separator = enc->dump_separator ? (const char *)enc->dump_separator : ", "; const char *separator = enc->dump_separator ? (const char *)enc->dump_separator : ", ";
@ -2825,7 +2825,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
bitrate = get_bit_rate(enc); bitrate = get_bit_rate(enc);
if (bitrate != 0) { if (bitrate != 0) {
snprintf(buf + strlen(buf), buf_size - strlen(buf), snprintf(buf + strlen(buf), buf_size - strlen(buf),
", %d kb/s", bitrate / 1000); ", %"PRId64" kb/s", bitrate / 1000);
} else if (enc->rc_max_rate > 0) { } else if (enc->rc_max_rate > 0) {
snprintf(buf + strlen(buf), buf_size - strlen(buf), snprintf(buf + strlen(buf), buf_size - strlen(buf),
", max. %"PRId64" kb/s", (int64_t)enc->rc_max_rate / 1000); ", max. %"PRId64" kb/s", (int64_t)enc->rc_max_rate / 1000);