virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '99143140dea12363af680d02e23cb42cfe191679'

Browse Source 
* commit '99143140dea12363af680d02e23cb42cfe191679':
  mp3dec: fix reading the Xing tag

Conflicts:
	libavformat/mp3dec.c

See: 19ff479f69
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-24 12:49:53 +02:00
parent 2c5ae57776 99143140de
commit 899d3706d8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mp3dec.c
View File

@@ -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,
(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));