diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 22:52:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 22:52:12 +0200 |
commit | c1d053621c2c437505c22321e12b2d2e71976a00 (patch) | |
tree | fe12c2e130fe792324ef0408184bb82acd981c24 /libavutil/replaygain.h | |
parent | 652061313979b99f91b27309ecd8baeef7b7865f (diff) | |
parent | 8542f9c4f17125d483c40c0c5723842f1c982f81 (diff) | |
download | ffmpeg-c1d053621c2c437505c22321e12b2d2e71976a00.tar.gz |
Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'
* commit '8542f9c4f17125d483c40c0c5723842f1c982f81':
replaygain: correctly parse peak values
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/replaygain.h')
-rw-r--r-- | libavutil/replaygain.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/replaygain.h b/libavutil/replaygain.h index a9ea19c67a..5c03e1993d 100644 --- a/libavutil/replaygain.h +++ b/libavutil/replaygain.h @@ -34,8 +34,8 @@ typedef struct AVReplayGain { */ int32_t track_gain; /** - * Peak track amplitude, with UINT32_MAX representing full scale. 0 when - * unknown. + * Peak track amplitude, with 100000 representing full scale (but values + * may overflow). 0 when unknown. */ uint32_t track_peak; /** |