diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2005-05-21 15:20:31 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2005-05-21 15:20:31 +0000 |
| commit | bd310139d29f08d2d8427a94f522261fb6a92d51 (patch) | |
| tree | 10de85b4e583f44c13c23cff9e30e19f9d00f7e0 /src | |
| parent | 7d78b0af92f534a46f43ff4f560c25d781261059 (diff) | |
| download | xine-lib-bd310139d29f08d2d8427a94f522261fb6a92d51.tar.gz xine-lib-bd310139d29f08d2d8427a94f522261fb6a92d51.tar.bz2 | |
Avoid integer overflow in bitrate calculation
CVS patchset: 7556
CVS date: 2005/05/21 15:20:31
Diffstat (limited to 'src')
| -rw-r--r-- | src/libfaad/xine_decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c index e3d997510..c0bca2c9c 100644 --- a/src/libfaad/xine_decoder.c +++ b/src/libfaad/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.39 2005/05/21 15:02:08 jstembridge Exp $ + * $Id: xine_decoder.c,v 1.40 2005/05/21 15:20:31 jstembridge Exp $ * */ @@ -219,7 +219,7 @@ static void faad_decode_audio ( faad_decoder_t *this, int end_frame ) { /* estimate bitrate */ this->total_time += (1000*this->faac_finfo.samples/(this->rate*this->num_channels)); - this->total_data += used; + this->total_data += 8*used; if ((this->total_time > LONG_MAX) || (this->total_data > LONG_MAX)) { this->total_time >>= 2; @@ -228,7 +228,7 @@ static void faad_decode_audio ( faad_decoder_t *this, int end_frame ) { if (this->total_time) _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, - 8000*this->total_data/this->total_time); + 1000*(this->total_data/this->total_time)); decoded = this->faac_finfo.samples * 2; /* 1 sample = 2 bytes */ |