diff options
| author | Mathias Panzenböck <grosser.meister.morti@gmx.net> | 2011-06-24 23:59:11 +0200 |
|---|---|---|
| committer | Mathias Panzenböck <grosser.meister.morti@gmx.net> | 2011-06-24 23:59:11 +0200 |
| commit | a04d7d0bbca9bd330ac97307a00ae52672bc1bef (patch) | |
| tree | 4154d0b179fa2d45fe8c27b14384c21f26948609 /taglib/mp4/mp4item.cpp | |
| parent | c7fd4cd2fcf15df3848cc6fa610655b4759104d3 (diff) | |
| parent | 6b063862c38dce47b5d2abd2df782a88b0dc4955 (diff) | |
Merge branch 'master' of https://github.com/taglib/taglib
Conflicts:
taglib/CMakeLists.txt
tests/CMakeLists.txt
Diffstat (limited to 'taglib/mp4/mp4item.cpp')
| -rw-r--r-- | taglib/mp4/mp4item.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/taglib/mp4/mp4item.cpp b/taglib/mp4/mp4item.cpp index 7dcf5946..d51a487c 100644 --- a/taglib/mp4/mp4item.cpp +++ b/taglib/mp4/mp4item.cpp @@ -27,8 +27,6 @@ #include <config.h> #endif -#ifdef WITH_MP4 - #include <taglib.h> #include <tdebug.h> #include "mp4item.h" @@ -146,4 +144,3 @@ MP4::Item::isValid() const return d->valid; } -#endif |