diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-03-04 23:19:57 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-03-04 23:19:57 +0000 |
| commit | e2d2baece9230967d8f1d5fdb5259515c2fb03c7 (patch) | |
| tree | 0e0e0470e22eb21a60cf694cbaad199aadc5e242 /src/libmad/frame.c | |
| parent | 7be523c015a18ffcfbdd9511e225609729b25a0c (diff) | |
| download | mpd-e2d2baece9230967d8f1d5fdb5259515c2fb03c7.tar.gz mpd-e2d2baece9230967d8f1d5fdb5259515c2fb03c7.tar.xz mpd-e2d2baece9230967d8f1d5fdb5259515c2fb03c7.zip | |
update to 0.15.1 of libmad and libid3tag
git-svn-id: https://svn.musicpd.org/mpd/trunk@196 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
| -rw-r--r-- | src/libmad/frame.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libmad/frame.c b/src/libmad/frame.c index 8c3342e98..0cb3d0f33 100644 --- a/src/libmad/frame.c +++ b/src/libmad/frame.c @@ -1,6 +1,6 @@ /* * libmad - MPEG audio decoder library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,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: frame.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: frame.c,v 1.29 2004/02/04 22:59:19 rob Exp $ */ # ifdef HAVE_CONFIG_H @@ -376,7 +376,8 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream) /* calculate free bit rate */ if (header->bitrate == 0) { - if ((stream->freerate == 0 || !stream->sync) && + if ((stream->freerate == 0 || !stream->sync || + (header->layer == MAD_LAYER_III && stream->freerate > 640000)) && free_bitrate(stream, header) == -1) goto fail; |