Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/core/multimedia/libmedi...

Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Conflicts:
	src/common/media-svc-util.c

Change-Id: Id5926f0a5bfaf1e97f2a113060f8643886260fa5

diff --cc src/common/media-svc-util.c
index 88b59cc,4b4fc01..a1da9fc
--- 1/src/common/media-svc-util.c
--- 2/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@@ -1705,9 -1831,10 +1813,9 @@@ int _media_svc_extract_music_metadata_f
                }
  
                mmf_error = mm_file_destroy_tag_attrs(tag);
 -              if (mmf_error != FILEINFO_ERROR_NONE) {
 +              if (mmf_error != FILEINFO_ERROR_NONE)
                        media_svc_error("fail to free tag attr - err(%x)", mmf_error);
-       }       else {
 -              }
+       } else {
                /* in case of file size 0, MMFW Can't parsting tag info but add it to Music DB. */
                char *no_tag_title = NULL;
                media_svc_error("no tag information");