summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-12-26 17:40:37 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-12-26 17:40:37 +0000
commit2e646cd8b83e3c0a1e95f9ed100f2285a65edf02 (patch)
tree0df0bc885f22ca0542ed94749732337004d51fd4
parente8c7abc1cbe6112a55becd59a381c03708eb3f39 (diff)
downloadxine-lib-2e646cd8b83e3c0a1e95f9ed100f2285a65edf02.tar.gz
xine-lib-2e646cd8b83e3c0a1e95f9ed100f2285a65edf02.tar.bz2
* Allow decoding of MusePack SV 7.x files (7.1 files at least play fine).
CVS patchset: 8464 CVS date: 2006/12/26 17:40:37
-rw-r--r--ChangeLog1
-rw-r--r--src/demuxers/demux_mpc.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a3585d1b6..0f2b88397 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@ xine-lib (1.1.4)
as the decoding is left entirely to FFmpeg); it's still in its infancy, but
it should be possible to remove WavPack dependency entirely in the future.
* Implement a True Audio files demuxer. [bug #1586381]
+ * Allow decoding of MusePack SV 7.x files (7.1 files at least play fine).
xine-lib (1.1.3)
* Security fixes:
diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
index ab2ef511d..deaebd375 100644
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -24,7 +24,7 @@
* APE tag reading
* Seeking??
*
- * $Id: demux_mpc.c,v 1.3 2005/03/06 11:41:00 jstembridge Exp $
+ * $Id: demux_mpc.c,v 1.4 2006/12/26 17:40:37 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -119,11 +119,11 @@ static int open_mpc_file(demux_mpc_t *this) {
}
}
- /* Validate signature - We only support SV7 at the moment */
+ /* Validate signature - We only support SV 7.x at the moment */
if ((this->header[0] != 'M') ||
(this->header[1] != 'P') ||
(this->header[2] != '+') ||
- (this->header[3] != 0x07))
+ ((this->header[3]&0x0f) != 0x07))
return 0;
/* Get frame count */