merge commits of 2.2.1 to public 32/13532/1 accepted/tizen/mobile tizen accepted/tizen/20131209.172553 submit/tizen/20131209.105054
authorjs1002.kim <js1002.kim@samsung.com>
Mon, 9 Dec 2013 06:59:27 +0000 (15:59 +0900)
committerjs1002.kim <js1002.kim@samsung.com>
Mon, 9 Dec 2013 06:59:27 +0000 (15:59 +0900)
commitb7837b9c5abecb0ff5894eeb6fcb2dd0b6a0115a
treeae777b0c560f51e286bba639d48443eb80c9adb5
parentefb8ad6e8fd1331f92ee75a101e31446f963ebff
merge commits of 2.2.1 to public

Change-Id: Ia115fe5a276a0a21d90023466d2d12feb5d6999c
Signed-off-by: js1002.kim <js1002.kim@samsung.com>
56 files changed:
inc/FMedia.h
inc/FMediaAudioDecoder.h [changed mode: 0644->0755]
inc/FMediaAudioEncoder.h [changed mode: 0644->0755]
inc/FMediaAudioEqualizer.h [changed mode: 0644->0755]
inc/FMediaAudioFrame.h
inc/FMediaAudioIn.h [changed mode: 0644->0755]
inc/FMediaAudioManagerTypes.h [changed mode: 0644->0755]
inc/FMediaAudioOut.h [changed mode: 0644->0755]
inc/FMediaAudioRecorder.h
inc/FMediaAudioRecorderTypes.h
inc/FMediaAudioRouteInfo.h [changed mode: 0644->0755]
inc/FMediaAudioRouteManager.h
inc/FMediaAudioStreamInfo.h [changed mode: 0644->0755]
inc/FMediaAudioTypes.h [changed mode: 0644->0755]
inc/FMediaCamera.h
inc/FMediaCameraTypes.h
inc/FMediaCapability.h
inc/FMediaCapabilityTypes.h
inc/FMediaIAudioInEventListener.h [changed mode: 0644->0755]
inc/FMediaIAudioOutEventListener.h [changed mode: 0644->0755]
inc/FMediaIAudioRecorderEventListener.h
inc/FMediaIAudioRouteEventListener.h [changed mode: 0644->0755]
inc/FMediaIAudioStreamFilter.h
inc/FMediaICameraEventListener.h
inc/FMediaIPlayerEventListener.h [changed mode: 0644->0755]
inc/FMediaIPlayerProgressiveDownloadListener.h [changed mode: 0644->0755]
inc/FMediaIPlayerVideoEventListener.h [changed mode: 0644->0755]
inc/FMediaITonePlayerEventListener.h [changed mode: 0644->0755]
inc/FMediaIVideoRecorderEventListener.h
inc/FMediaIVideoStreamFilter.h
inc/FMediaMediaStreamInfo.h [changed mode: 0644->0755]
inc/FMediaOpenal.h [changed mode: 0644->0755]
inc/FMediaPlayer.h
inc/FMediaPlayerTypes.h [changed mode: 0644->0755]
inc/FMediaRecorderTypes.h
inc/FMediaTone.h [changed mode: 0644->0755]
inc/FMediaTonePlayer.h
inc/FMediaToneTypes.h [changed mode: 0644->0755]
inc/FMediaVideoDecoder.h [changed mode: 0644->0755]
inc/FMediaVideoEncoder.h [changed mode: 0644->0755]
inc/FMediaVideoFrame.h
inc/FMediaVideoFrameExtractor.h [changed mode: 0644->0755]
inc/FMediaVideoRecorder.h
inc/FMediaVideoRecorderTypes.h
inc/FMediaVideoStreamInfo.h [changed mode: 0644->0755]
src/FMediaAudioIn.cpp [changed mode: 0644->0755]
src/FMedia_AudioOutImpl.cpp [changed mode: 0644->0755]
src/FMedia_AudioRecorderImpl.cpp
src/FMedia_AudioRecorderImpl.h
src/FMedia_CapabilityImpl.cpp
src/FMedia_PlayerImpl.cpp [changed mode: 0644->0755]
src/FMedia_RecorderTypes.h
src/FMedia_VideoRecorderImpl.cpp
src/FMedia_VideoRecorderImpl.h
src/FMedia_VorbisDecoder.cpp [changed mode: 0644->0755]
src/FMedia_VorbisDecoder.h [changed mode: 0644->0755]