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

Browse Source

# Conflicts:
#	CMakeLists.txt
#	ConfigureChecks.cmake
#	taglib/flac/flacfile.cpp
#	taglib/mp4/mp4file.cpp
#	taglib/mpeg/mpegheader.cpp
#	taglib/mpeg/mpegproperties.cpp
#	taglib/riff/rifffile.cpp
#	taglib/toolkit/trefcounter.h

...

This commit is contained in:

Tsuda Kageyu

2015-12-16 13:33:04 +09:00

parent 1f5ed5fb28 36b905670c

commit f72b0ecebf

18 changed files with 343 additions and 166 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

BIN

tests/data/invalid-frames.mp3 Normal file

Binary file not shown.