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

Browse Source

# Conflicts:
#	taglib/ape/apetag.cpp
#	taglib/ape/apetag.h
#	taglib/flac/flacproperties.cpp
#	taglib/mpeg/id3v1/id3v1tag.cpp
#	taglib/mpeg/id3v2/id3v2tag.cpp
#	taglib/riff/rifffile.cpp
#	taglib/riff/wav/infotag.cpp
#	taglib/toolkit/tbytevector.cpp

...

This commit is contained in:

Tsuda Kageyu

2015-12-02 09:31:10 +09:00

parent 6f5874a035 6966be4292

commit d36550f96d

20 changed files with 191 additions and 95 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/blank_video.m4v Normal file

Binary file not shown.