From: eunhae choi <eunhae1.choi@samsung.com>
Date: Mon, 15 May 2017 08:29:16 +0000 (+0000)
Subject: Merge "[Player]Added raw_video and custom_audio_effect features." into tizen
X-Git-Tag: submit/trunk/20170823.075128~94^2~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f71247fe8d1d1bb84c030d468de6ed79b6555d0e;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

Merge "[Player]Added raw_video and custom_audio_effect features." into tizen
---

f71247fe8d1d1bb84c030d468de6ed79b6555d0e
diff --cc src/Tizen.Multimedia/Tizen.Multimedia.csproj
index 8c924d7,0df2ed3..baafeee
--- a/src/Tizen.Multimedia/Tizen.Multimedia.csproj
+++ b/src/Tizen.Multimedia/Tizen.Multimedia.csproj
@@@ -326,4 -335,4 +327,4 @@@
      <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
      <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
    </PropertyGroup>
--</Project>
++</Project>