[tracker: 2/2] Merge branch 'use-libmediaart'

[Martyn James Russell <mr src gnome org>]

commit 87e54e21fc5b281dea34c0b554ca783a2bc638d4
Merge: 187dfd4 356b270
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Feb 6 18:58:21 2014 +0000

    Merge branch 'use-libmediaart'

 configure.ac                                     |   18 +-
 src/libtracker-common/Makefile.am                |    6 +-
 src/libtracker-common/tracker-common.h           |    1 -
 src/libtracker-common/tracker-media-art.c        |  322 ------
 src/libtracker-common/tracker-media-art.h        |   42 -
 src/libtracker-miner/tracker-media-art.c         |   19 +-
 src/tracker-extract/Makefile.am                  |   15 +-
 src/tracker-extract/tracker-extract-gstreamer.c  |   41 +-
 src/tracker-extract/tracker-extract-libav.c      |   14 +-
 src/tracker-extract/tracker-extract-mp3.c        |   18 +-
 src/tracker-extract/tracker-extract-vorbis.c     |   18 +-
 src/tracker-extract/tracker-main.c               |   19 +-
 src/tracker-extract/tracker-media-art-dummy.c    |   49 -
 src/tracker-extract/tracker-media-art-generic.h  |   42 -
 src/tracker-extract/tracker-media-art-pixbuf.c   |  176 ----
 src/tracker-extract/tracker-media-art-qt.cpp     |  199 ----
 src/tracker-extract/tracker-media-art.c          | 1128 ----------------------
 src/tracker-extract/tracker-media-art.h          |   47 -
 tests/libtracker-common/Makefile.am              |    3 -
 tests/libtracker-common/tracker-media-art-test.c |  178 ----
 20 files changed, 83 insertions(+), 2272 deletions(-)
---