summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Mattern <thibaut.mattern@gmail.com>2008-02-18 22:24:15 +0100
committerThibaut Mattern <thibaut.mattern@gmail.com>2008-02-18 22:24:15 +0100
commitc84a6972f442ba7baa62dd94ea5cc2882cc50ef3 (patch)
tree2970653f116893fa2c077955929f2ae0e3dcbaa2
parenta03ad73663dc3342f3f6d2a084b55cb05229054d (diff)
parent0ac9aca92944c9a3243dabace9a928916010dd55 (diff)
downloadxine-lib-c84a6972f442ba7baa62dd94ea5cc2882cc50ef3.tar.gz
xine-lib-c84a6972f442ba7baa62dd94ea5cc2882cc50ef3.tar.bz2
merge backout
-rw-r--r--src/demuxers/demux_mpgaudio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 648f04410..56759dd4b 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -725,8 +725,8 @@ static int demux_mpgaudio_next (demux_mpgaudio_t *this, int decoder_flags, int s
/* the stream is broken, don't keep info about previous frames */
this->free_bitrate_size = 0;
- if ( id3v2_istag(_X_ME_32(header)) ) {
- if (!id3v2_parse_tag(this->input, this->stream, _X_ME_32(header))) {
+ if ( id3v2_istag(header) ) {
+ if (!id3v2_parse_tag(this->input, this->stream, header)) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
LOG_MODULE ": ID3V2 tag parsing error\n");
bytes = 1; /* resync */