Diffstat (limited to 'core/multimedia/opieplayer/libmad/frame.c') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/multimedia/opieplayer/libmad/frame.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/core/multimedia/opieplayer/libmad/frame.c b/core/multimedia/opieplayer/libmad/frame.c index bf15e7f..3aacb56 100644 --- a/core/multimedia/opieplayer/libmad/frame.c +++ b/core/multimedia/opieplayer/libmad/frame.c @@ -2,3 +2,3 @@ * libmad - MPEG audio decoder library - * Copyright (C) 2000-2001 Robert Leslie + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * @@ -212,3 +212,9 @@ int decode_header(struct mad_header *header, struct mad_stream *stream) - 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; @@ -216,2 +222,3 @@ int decode_header(struct mad_header *header, struct mad_stream *stream) } +# endif @@ -285,6 +292,2 @@ int free_bitrate(struct mad_stream *stream, struct mad_header const *header) -# if 0 && defined(DEBUG) - fprintf(stderr, "free bitrate == %lu\n", stream->freerate); -# endif - return 0; @@ -375,3 +378,4 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream) 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) |