Browse Source

Merge commit '99143140dea12363af680d02e23cb42cfe191679'

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

Conflicts:
	libavformat/mp3dec.c

See: 19ff479f69
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Michael Niedermayer 11 years ago
parent
commit
899d3706d8
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      libavformat/mp3dec.c

+ 3
- 2
libavformat/mp3dec.c View File

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


Loading…
Cancel
Save