Merge branch 'master' into merge-master-to-taglib2

Browse Source

# Conflicts:
#	taglib/ape/apeitem.cpp
#	taglib/mpeg/mpegheader.cpp
#	taglib/toolkit/tutils.h

...

This commit is contained in:

Tsuda Kageyu

2016-02-04 20:48:31 +09:00

parent b972f24193 a8ecbbaef4

commit 57e849b0d5

17 changed files with 181 additions and 81 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

tests/data/invalid-frames.mp3 → tests/data/invalid-frames1.mp3

BIN

tests/data/invalid-frames3.mp3 Normal file

Binary file not shown.

BIN

tests/data/pcm_with_fact_chunk.wav Normal file

Binary file not shown.