summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Mattern <tmattern@users.sourceforge.net>2003-11-26 22:40:25 +0000
committerThibaut Mattern <tmattern@users.sourceforge.net>2003-11-26 22:40:25 +0000
commit23176d5f3aaafdf90795fb847a064d0bb1b8d198 (patch)
tree09005e3a1a50bfdcb3f6d2d7ac8bef9a95bbfa68
parent8881fb73b3601d02796eab988e2d1d6aff1ee07a (diff)
downloadxine-lib-23176d5f3aaafdf90795fb847a064d0bb1b8d198.tar.gz
xine-lib-23176d5f3aaafdf90795fb847a064d0bb1b8d198.tar.bz2
oops, wrong bit.
fix Xing header parsing with mpeg 2 streams. CVS patchset: 5800 CVS date: 2003/11/26 22:40:25
-rw-r--r--src/demuxers/demux_mpgaudio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index b5fc2d363..21eb10ef5 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.128 2003/11/26 19:43:30 f1rmb Exp $
+ * $Id: demux_mpgaudio.c,v 1.129 2003/11/26 22:40:25 tmattern Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -309,14 +309,12 @@ static int mpg123_parse_xing_header(demux_mpgaudio_t *this, uint8_t *buf, int bu
double frame_duration;
/* offset of the Xing header */
- if( this->cur_frame.mpeg25_bit ) {
- /* mpeg1 */
+ if (this->cur_frame.lsf_bit) {
if( this->cur_frame.channel_mode != 3 )
ptr += (32 + 4);
else
ptr += (17 + 4);
} else {
- /* mpeg2 */
if( this->cur_frame.channel_mode != 3 )
ptr += (17 + 4);
else