diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:10:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:10:56 +0100 |
| commit | 275cd55a0f4b0d11aa35c1dcde9c8b356f8b418f (patch) | |
| tree | aa28cbcc2baf994eebec10cdbf572d59cb1736b3 | |
| parent | 749fadaa651e21540f3c86561be9be9f098ddb44 (diff) | |
| parent | 556a5090f2b0a20fd9998e1a327875f5b0c8d1d5 (diff) | |
| download | ffmpeg-275cd55a0f4b0d11aa35c1dcde9c8b356f8b418f.tar.gz | |
Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4
* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
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 4872afc43c..ea9f2c35aa 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)); |