copyright: apply Apache License, Version 2.0

4 files changed, 22 insertions, 32 deletions

diff --git a/core/src/Android.mk b/core/src/Android.mk
index f526873..3ae9ef6 100644
--- a/core/src/Android.mk
+++ b/core/src/Android.mk
@@ -1,11 +1,3 @@
-#
-# Copyright (c) 2009-2010 Wind River Systems, Inc.
-#
-# The right to copy, distribute, modify, or otherwise make use
-# of this software may be licensed only pursuant to the terms
-# of an applicable Wind River license agreement.
-#
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
diff --git a/core/src/ebuild.mk b/core/src/ebuild.mk
index aa1f298..d2ce4ff 100644
--- a/core/src/ebuild.mk
+++ b/core/src/ebuild.mk
@@ -1,11 +1,3 @@
-#
-# Copyright (c) 2009-2010 Wind River Systems, Inc.
-#
-# The right to copy, distribute, modify, or otherwise make use
-# of this software may be licensed only pursuant to the terms
-# of an applicable Wind River license agreement.
-#
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
diff --git a/core/src/pv_omx_interface.cpp b/core/src/pv_omx_interface.cpp
index 2d406ba..7de2d20 100644
--- a/core/src/pv_omx_interface.cpp
+++ b/core/src/pv_omx_interface.cpp
@@ -1,11 +1,3 @@
-/*
- * Copyright (c) 2009-2010 Wind River Systems, Inc.
- *
- * The right to copy, distribute, modify, or otherwise make use
- * of this software may be licensed only pursuant to the terms
- * of an applicable Wind River license agreement.
- */
-
 /* ------------------------------------------------------------------
  * Copyright (C) 1998-2009 PacketVideo
  *
@@ -23,11 +15,16 @@
  * and limitations under the License.
  * -------------------------------------------------------------------
  */
+
+/* Contains changes by Wind River Systems, 2009-2010 */
+
 #include "pvlogger.h"
 
 #include "pv_omxcore.h"
 #include "omx_interface.h"
 
+
+
 class PVOMXInterface : public OMXInterface
 {
     public:
@@ -69,7 +66,7 @@ class PVOMXInterface : public OMXInterface
             pOMX_GetRolesOfComponent = OMX_GetRolesOfComponent;
             pOMX_SetupTunnel = OMX_SetupTunnel;
             pOMX_GetContentPipe = OMX_GetContentPipe;
-            //pOMXConfigParser = OMXConfigParser;
+            /* pOMXConfigParser = OMXConfigParser; */
         };
 
 };
@@ -81,13 +78,12 @@ extern "C"
     {
         return PVOMXInterface::Instance();
     }
-    OSCL_EXPORT_REF void PVReleaseInterface(void* aInterface)
+    OSCL_EXPORT_REF void PVReleaseInterface(void* interface)
     {
-        PVOMXInterface* pInterface = (PVOMXInterface*)aInterface;
+        PVOMXInterface* pInterface = (PVOMXInterface*)interface;
         if (pInterface)
         {
             OSCL_DELETE(pInterface);
         }
     }
-
 }
diff --git a/core/src/wrs_omxcore.cpp b/core/src/wrs_omxcore.cpp
index efb21cc..807ba6b 100644
--- a/core/src/wrs_omxcore.cpp
+++ b/core/src/wrs_omxcore.cpp
@@ -1,9 +1,19 @@
 /*
- * Copyright (c) 2009 Wind River Systems, Inc.
+ * wrs_core.cpp, Wind River OpenMax-IL Core
  *
- * The right to copy, distribute, modify, or otherwise make use
- * of this software may be licensed only pursuant to the terms
- * of an applicable Wind River license agreement.
+ * Copyright (c) 2009-2010 Wind River Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #include <stdio.h>