merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:15:50 +0000 (01:15 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:15:50 +0000 (01:15 +0900)
commit2d702ad09e5bb6c1c6d9e01db061c25da1a6a353
treeb17410f2107466a74b3f9e11db2c914fb910922f
parent46b5b83b1794c58b1409a0406653185d2c5ac92a
merge with master
17 files changed:
configure.ac
formats/ffmpeg/Makefile.am
formats/ffmpeg/include/mm_file_format_id3tag.h
formats/ffmpeg/mm_file_format_aac.c
formats/ffmpeg/mm_file_format_ffmpeg.c
formats/ffmpeg/mm_file_format_frame.c
formats/ffmpeg/mm_file_format_mp3.c
formats/ffmpeg/mm_file_formats.c
include/mm_file.h
include/mm_file_format_frame.h
include/mm_file_formats.h
mm_file.c
packaging/libmm-fileinfo.spec
tests/mm_file_test.c
utils/include/mm_file_utils.h
utils/mm_file_util_print.c
utils/mm_file_util_tag.c