diff options
author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2005-09-15 18:45:15 +0000 |
---|---|---|
committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2005-09-15 18:45:15 +0000 |
commit | 2264a09075c70b82646eae5c7ac83f0ea4c70272 (patch) | |
tree | f66b75e080daca467a3e0139d02652ed4c9d0df3 /src/demuxers/demux_mpgaudio.c | |
parent | 004757624bab4a312da75983992225d835b757b2 (diff) | |
download | xine-lib-2264a09075c70b82646eae5c7ac83f0ea4c70272.tar.gz xine-lib-2264a09075c70b82646eae5c7ac83f0ea4c70272.tar.bz2 |
Added minimal id3 v2.4 support.
CVS patchset: 7734
CVS date: 2005/09/15 18:45:15
Diffstat (limited to 'src/demuxers/demux_mpgaudio.c')
-rw-r--r-- | src/demuxers/demux_mpgaudio.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 47b49d4de..6e354f625 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -17,7 +17,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: demux_mpgaudio.c,v 1.140 2005/02/07 18:47:12 tmattern Exp $ + * $Id: demux_mpgaudio.c,v 1.141 2005/09/15 18:45:15 tmattern Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -567,8 +567,13 @@ static int demux_mpgaudio_next (demux_mpgaudio_t *this, int decoder_flags) { } else if ((BE_32(header_buf)) == ID3V24_TAG) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "demux_mpgaudio: ID3V2.4 tag\n"); - /* TODO: add parsing here */ - bytes = 1; /* resync */ + if (!id3v24_parse_tag(this->input, this->stream, header_buf)) { + xprintf(this->stream->xine, XINE_VERBOSITY_LOG, + "demux_mpgaudio: ID3V2.4 tag parsing error\n"); + bytes = 1; /* resync */ + } else { + bytes = 4; + } } else { /* skip */ |