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

Browse Source

# Conflicts:
#	taglib/flac/flacfile.h
#	taglib/mpeg/mpegheader.cpp
#	taglib/mpeg/mpegproperties.cpp
#	taglib/ogg/oggfile.cpp
#	taglib/ogg/oggpage.cpp
#	taglib/ogg/oggpageheader.cpp
#	tests/test_mpeg.cpp

...

This commit is contained in:

Tsuda Kageyu

2016-01-06 10:28:09 +09:00

parent c3c862e911 8d5f821b16

commit 1a73c82a76

22 changed files with 541 additions and 435 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

Binary file not shown.

BIN

tests/data/invalid-frames2.mp3 Normal file

Binary file not shown.