1 files changed, 12 insertions, 8 deletions

diff --git a/src/libmad/frame.c b/src/libmad/frame.c
index 537bc8da2..6fe1970c0 100755
--- a/src/libmad/frame.c
+++ b/src/libmad/frame.c
@@ -1,6 +1,6 @@
 /*
  * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * 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.2 2002/04/30 18:46:58 miguelfreitas Exp $
+ * $Id: frame.c,v 1.3 2004/04/22 00:22:36 miguelfreitas Exp $
  */
 
 # ifdef HAVE_CONFIG_H
@@ -210,10 +210,17 @@ int decode_header(struct mad_header *header, struct mad_stream *stream)
   /* emphasis */
   header->emphasis = mad_bit_read(&stream->ptr, 2);
 
-  if (header->emphasis == 2) {
+# if defined(OPT_STRICT)
+  /*
+   * ISO/IEC 11172-3 says this is a reserved emphasis value, but
+   * streams exist which use it anyway. Since the value is not important
+   * to the decoder proper, we allow it unless OPT_STRICT is defined.
+   */
+  if (header->emphasis == MAD_EMPHASIS_RESERVED) {
     stream->error = MAD_ERROR_BADEMPHASIS;
     return -1;
   }
+# endif
 
   /* error_check() */
 
@@ -283,10 +290,6 @@ int free_bitrate(struct mad_stream *stream, struct mad_header const *header)
 
   stream->freerate = rate * 1000;
 
-# if 0 && defined(DEBUG)
-  fprintf(stderr, "free bitrate == %lu\n", stream->freerate);
-# endif
-
   return 0;
 }
 
@@ -373,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;