generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1'

Browse Source 
* commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1':
  replaygain: fix gain sign decoding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-04 22:43:37 +02:00
commit 6520613139
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/replaygain.c
View File

@ -40,6 +40,7 @@ static int32_t parse_gain(const char *gain)
char *fraction; char *fraction;
int scale = 10000; int scale = 10000;
int32_t mb = 0; int32_t mb = 0;
int sign = 1;
int db; int db;
if (!gain) if (!gain)
@ -47,6 +48,9 @@ static int32_t parse_gain(const char *gain)
gain += strspn(gain, " \t"); gain += strspn(gain, " \t");
if (*gain == '-')
sign = -1;
db = strtol(gain, &fraction, 0); db = strtol(gain, &fraction, 0);
if (*fraction++ == '.') { if (*fraction++ == '.') {
while (av_isdigit(*fraction) && scale) { while (av_isdigit(*fraction) && scale) {
@ -59,7 +63,7 @@ static int32_t parse_gain(const char *gain)
if (abs(db) > (INT32_MAX - mb) / 100000) if (abs(db) > (INT32_MAX - mb) / 100000)
return INT32_MIN; return INT32_MIN;
return db * 100000 + FFSIGN(db) * mb; return db * 100000 + sign * mb;
} }
static uint32_t parse_peak(const uint8_t *peak) static uint32_t parse_peak(const uint8_t *peak)