diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:49:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:49:53 +0200 |
| commit | 899d3706d8fde29b78d0a72f92cfcd8be6aab419 (patch) | |
| tree | db59a9fd83b3937b41678643f7a27382549a4b7a | |
| parent | 2c5ae57776907142b78243cbf502be6f5370ca87 (diff) | |
| parent | 99143140dea12363af680d02e23cb42cfe191679 (diff) | |
| download | ffmpeg-899d3706d8fde29b78d0a72f92cfcd8be6aab419.tar.gz | |
Merge commit '99143140dea12363af680d02e23cb42cfe191679'
* commit '99143140dea12363af680d02e23cb42cfe191679':
mp3dec: fix reading the Xing tag
Conflicts:
libavformat/mp3dec.c
See: 19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mp3dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 8745f209d3..88256ef475 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -37,6 +37,7 @@ #define XING_FLAG_FRAMES 0x01 #define XING_FLAG_SIZE 0x02 #define XING_FLAG_TOC 0x04 +#define XING_FLAC_QSCALE 0x08 #define XING_TOC_COUNT 100 @@ -168,8 +169,8 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, (AVRational){spf, c->sample_rate}, st->time_base)); /* VBR quality */ - if(v & 8) - avio_skip(s->pb, 4); + if (v & XING_FLAC_QSCALE) + avio_rb32(s->pb); /* Encoder short version string */ memset(version, 0, sizeof(version)); |