Commit 899d3706 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '99143140'

* commit '99143140':
  mp3dec: fix reading the Xing tag

Conflicts:
	libavformat/mp3dec.c

See: 19ff479fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2c5ae577 99143140
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#define XING_FLAG_FRAMES 0x01 #define XING_FLAG_FRAMES 0x01
#define XING_FLAG_SIZE 0x02 #define XING_FLAG_SIZE 0x02
#define XING_FLAG_TOC 0x04 #define XING_FLAG_TOC 0x04
#define XING_FLAC_QSCALE 0x08
#define XING_TOC_COUNT 100 #define XING_TOC_COUNT 100
...@@ -168,8 +169,8 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, ...@@ -168,8 +169,8 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st,
(AVRational){spf, c->sample_rate}, (AVRational){spf, c->sample_rate},
st->time_base)); st->time_base));
/* VBR quality */ /* VBR quality */
if(v & 8) if (v & XING_FLAC_QSCALE)
avio_skip(s->pb, 4); avio_rb32(s->pb);
/* Encoder short version string */ /* Encoder short version string */
memset(version, 0, sizeof(version)); memset(version, 0, sizeof(version));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment