Fix for: 4676350 Do not use dual copyright declaration for video editor code

Change-Id: I2856be051fa3b3ddfe67e096e45fb0b34beb92be

36 files changed, 0 insertions, 36 deletions

diff --git a/libvideoeditor/osal/inc/LVOSA_FileReader_optim.h b/libvideoeditor/osal/inc/LVOSA_FileReader_optim.h
index df0375b..237376d 100755
--- a/libvideoeditor/osal/inc/LVOSA_FileReader_optim.h
+++ b/libvideoeditor/osal/inc/LVOSA_FileReader_optim.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/LV_Macros.h b/libvideoeditor/osal/inc/LV_Macros.h
index fa927b7..b8d7e85 100755
--- a/libvideoeditor/osal/inc/LV_Macros.h
+++ b/libvideoeditor/osal/inc/LV_Macros.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_CharStar.h b/libvideoeditor/osal/inc/M4OSA_CharStar.h
index abd6c9f..06316f0 100755
--- a/libvideoeditor/osal/inc/M4OSA_CharStar.h
+++ b/libvideoeditor/osal/inc/M4OSA_CharStar.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Clock.h b/libvideoeditor/osal/inc/M4OSA_Clock.h
index ca3c39e..db753a5 100755
--- a/libvideoeditor/osal/inc/M4OSA_Clock.h
+++ b/libvideoeditor/osal/inc/M4OSA_Clock.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_CoreID.h b/libvideoeditor/osal/inc/M4OSA_CoreID.h
index e8ca1a2..9172800 100755
--- a/libvideoeditor/osal/inc/M4OSA_CoreID.h
+++ b/libvideoeditor/osal/inc/M4OSA_CoreID.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Debug.h b/libvideoeditor/osal/inc/M4OSA_Debug.h
index 6d93c9c..b06183d 100755
--- a/libvideoeditor/osal/inc/M4OSA_Debug.h
+++ b/libvideoeditor/osal/inc/M4OSA_Debug.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Error.h b/libvideoeditor/osal/inc/M4OSA_Error.h
index 963bb63..abcfe4f 100755
--- a/libvideoeditor/osal/inc/M4OSA_Error.h
+++ b/libvideoeditor/osal/inc/M4OSA_Error.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Export.h b/libvideoeditor/osal/inc/M4OSA_Export.h
index 4d38346..b7a6e81 100755
--- a/libvideoeditor/osal/inc/M4OSA_Export.h
+++ b/libvideoeditor/osal/inc/M4OSA_Export.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_FileCommon.h b/libvideoeditor/osal/inc/M4OSA_FileCommon.h
index eda6921..f2afb8c 100755
--- a/libvideoeditor/osal/inc/M4OSA_FileCommon.h
+++ b/libvideoeditor/osal/inc/M4OSA_FileCommon.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_FileCommon_priv.h b/libvideoeditor/osal/inc/M4OSA_FileCommon_priv.h
index 261070f..1eba456 100755
--- a/libvideoeditor/osal/inc/M4OSA_FileCommon_priv.h
+++ b/libvideoeditor/osal/inc/M4OSA_FileCommon_priv.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_FileReader.h b/libvideoeditor/osal/inc/M4OSA_FileReader.h
index f0c75ff..c22756d 100755
--- a/libvideoeditor/osal/inc/M4OSA_FileReader.h
+++ b/libvideoeditor/osal/inc/M4OSA_FileReader.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_FileReader_priv.h b/libvideoeditor/osal/inc/M4OSA_FileReader_priv.h
index be2af9a..327b086 100755
--- a/libvideoeditor/osal/inc/M4OSA_FileReader_priv.h
+++ b/libvideoeditor/osal/inc/M4OSA_FileReader_priv.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_FileWriter.h b/libvideoeditor/osal/inc/M4OSA_FileWriter.h
index b8ba553..9a11331 100755
--- a/libvideoeditor/osal/inc/M4OSA_FileWriter.h
+++ b/libvideoeditor/osal/inc/M4OSA_FileWriter.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_FileWriter_priv.h b/libvideoeditor/osal/inc/M4OSA_FileWriter_priv.h
index 157d176..9d972f4 100755
--- a/libvideoeditor/osal/inc/M4OSA_FileWriter_priv.h
+++ b/libvideoeditor/osal/inc/M4OSA_FileWriter_priv.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Memory.h b/libvideoeditor/osal/inc/M4OSA_Memory.h
index d80fff6..a4d15cc 100755
--- a/libvideoeditor/osal/inc/M4OSA_Memory.h
+++ b/libvideoeditor/osal/inc/M4OSA_Memory.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Mutex.h b/libvideoeditor/osal/inc/M4OSA_Mutex.h
index 92a416f..d496bdd 100755
--- a/libvideoeditor/osal/inc/M4OSA_Mutex.h
+++ b/libvideoeditor/osal/inc/M4OSA_Mutex.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_OptionID.h b/libvideoeditor/osal/inc/M4OSA_OptionID.h
index b937644..61b9044 100755
--- a/libvideoeditor/osal/inc/M4OSA_OptionID.h
+++ b/libvideoeditor/osal/inc/M4OSA_OptionID.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Semaphore.h b/libvideoeditor/osal/inc/M4OSA_Semaphore.h
index fe73673..2630454 100755
--- a/libvideoeditor/osal/inc/M4OSA_Semaphore.h
+++ b/libvideoeditor/osal/inc/M4OSA_Semaphore.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Thread.h b/libvideoeditor/osal/inc/M4OSA_Thread.h
index 183a9f3..ca96afb 100755
--- a/libvideoeditor/osal/inc/M4OSA_Thread.h
+++ b/libvideoeditor/osal/inc/M4OSA_Thread.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Thread_priv.h b/libvideoeditor/osal/inc/M4OSA_Thread_priv.h
index fb9a51a..b424b05 100755
--- a/libvideoeditor/osal/inc/M4OSA_Thread_priv.h
+++ b/libvideoeditor/osal/inc/M4OSA_Thread_priv.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Time.h b/libvideoeditor/osal/inc/M4OSA_Time.h
index 737ebad..21f25ed 100755
--- a/libvideoeditor/osal/inc/M4OSA_Time.h
+++ b/libvideoeditor/osal/inc/M4OSA_Time.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/inc/M4OSA_Types.h b/libvideoeditor/osal/inc/M4OSA_Types.h
index 2ee9568..92a68d8 100755
--- a/libvideoeditor/osal/inc/M4OSA_Types.h
+++ b/libvideoeditor/osal/inc/M4OSA_Types.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/Android.mk b/libvideoeditor/osal/src/Android.mk
index 1b21079..6e1d79a 100755
--- a/libvideoeditor/osal/src/Android.mk
+++ b/libvideoeditor/osal/src/Android.mk
@@ -1,5 +1,4 @@
 #

-# Copyright (C) 2011 NXP Software

 # Copyright (C) 2011 The Android Open Source Project

 #

 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
index dc84eab..e11e008 100755
--- a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
+++ b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_CharStar.c b/libvideoeditor/osal/src/M4OSA_CharStar.c
index eb7e525..0814cbf 100755
--- a/libvideoeditor/osal/src/M4OSA_CharStar.c
+++ b/libvideoeditor/osal/src/M4OSA_CharStar.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_Clock.c b/libvideoeditor/osal/src/M4OSA_Clock.c
index 85fe303..9817b22 100755
--- a/libvideoeditor/osal/src/M4OSA_Clock.c
+++ b/libvideoeditor/osal/src/M4OSA_Clock.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_FileCommon.c b/libvideoeditor/osal/src/M4OSA_FileCommon.c
index 5927661..c12db5d 100755
--- a/libvideoeditor/osal/src/M4OSA_FileCommon.c
+++ b/libvideoeditor/osal/src/M4OSA_FileCommon.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_FileReader.c b/libvideoeditor/osal/src/M4OSA_FileReader.c
index 5e9f757..40a72f5 100755
--- a/libvideoeditor/osal/src/M4OSA_FileReader.c
+++ b/libvideoeditor/osal/src/M4OSA_FileReader.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_FileWriter.c b/libvideoeditor/osal/src/M4OSA_FileWriter.c
index 92b462f..37fc173 100755
--- a/libvideoeditor/osal/src/M4OSA_FileWriter.c
+++ b/libvideoeditor/osal/src/M4OSA_FileWriter.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_Mutex.c b/libvideoeditor/osal/src/M4OSA_Mutex.c
index 8db3e2a..bbe6bba 100755
--- a/libvideoeditor/osal/src/M4OSA_Mutex.c
+++ b/libvideoeditor/osal/src/M4OSA_Mutex.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_Random.c b/libvideoeditor/osal/src/M4OSA_Random.c
index 63fdf5e..c24d039 100755
--- a/libvideoeditor/osal/src/M4OSA_Random.c
+++ b/libvideoeditor/osal/src/M4OSA_Random.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_Semaphore.c b/libvideoeditor/osal/src/M4OSA_Semaphore.c
index aeac0a9..f3b5852 100755
--- a/libvideoeditor/osal/src/M4OSA_Semaphore.c
+++ b/libvideoeditor/osal/src/M4OSA_Semaphore.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4OSA_Thread.c b/libvideoeditor/osal/src/M4OSA_Thread.c
index 793c0e4..db54245 100755
--- a/libvideoeditor/osal/src/M4OSA_Thread.c
+++ b/libvideoeditor/osal/src/M4OSA_Thread.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4PSW_DebugTrace.c b/libvideoeditor/osal/src/M4PSW_DebugTrace.c
index 71a6a06..0fcba94 100755
--- a/libvideoeditor/osal/src/M4PSW_DebugTrace.c
+++ b/libvideoeditor/osal/src/M4PSW_DebugTrace.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4PSW_MemoryInterface.c b/libvideoeditor/osal/src/M4PSW_MemoryInterface.c
index 6c33fc1..ea4ccea 100755
--- a/libvideoeditor/osal/src/M4PSW_MemoryInterface.c
+++ b/libvideoeditor/osal/src/M4PSW_MemoryInterface.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/libvideoeditor/osal/src/M4PSW_Trace.c b/libvideoeditor/osal/src/M4PSW_Trace.c
index 17b0af6..f3d9a1f 100755
--- a/libvideoeditor/osal/src/M4PSW_Trace.c
+++ b/libvideoeditor/osal/src/M4PSW_Trace.c
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2004-2011 NXP Software
  * Copyright (C) 2011 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");