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

Change-Id: I2856be051fa3b3ddfe67e096e45fb0b34beb92be

177 files changed, 0 insertions, 177 deletions

diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk
index 8b5a6f5..116ab29 100755
--- a/libvideoeditor/lvpp/Android.mk
+++ b/libvideoeditor/lvpp/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/lvpp/DummyAudioSource.cpp b/libvideoeditor/lvpp/DummyAudioSource.cpp
index 8273a40..db1b573 100755
--- a/libvideoeditor/lvpp/DummyAudioSource.cpp
+++ b/libvideoeditor/lvpp/DummyAudioSource.cpp
@@ -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/lvpp/DummyAudioSource.h b/libvideoeditor/lvpp/DummyAudioSource.h
index bb3f4a2..b329bb4 100755
--- a/libvideoeditor/lvpp/DummyAudioSource.h
+++ b/libvideoeditor/lvpp/DummyAudioSource.h
@@ -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/lvpp/DummyVideoSource.cpp b/libvideoeditor/lvpp/DummyVideoSource.cpp
index 8081660..e965575 100755
--- a/libvideoeditor/lvpp/DummyVideoSource.cpp
+++ b/libvideoeditor/lvpp/DummyVideoSource.cpp
@@ -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/lvpp/DummyVideoSource.h b/libvideoeditor/lvpp/DummyVideoSource.h
index 686e637..6fb39c5 100755
--- a/libvideoeditor/lvpp/DummyVideoSource.h
+++ b/libvideoeditor/lvpp/DummyVideoSource.h
@@ -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/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index 8c9ef10..e6a7934 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -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/lvpp/PreviewPlayer.h b/libvideoeditor/lvpp/PreviewPlayer.h
index b793639..55a8259 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.h
+++ b/libvideoeditor/lvpp/PreviewPlayer.h
@@ -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/lvpp/PreviewRenderer.cpp b/libvideoeditor/lvpp/PreviewRenderer.cpp
index 8f172f3..1323ca1 100755
--- a/libvideoeditor/lvpp/PreviewRenderer.cpp
+++ b/libvideoeditor/lvpp/PreviewRenderer.cpp
@@ -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/lvpp/PreviewRenderer.h b/libvideoeditor/lvpp/PreviewRenderer.h
index ccfcf86..4c9fa40 100755
--- a/libvideoeditor/lvpp/PreviewRenderer.h
+++ b/libvideoeditor/lvpp/PreviewRenderer.h
@@ -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/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
index 70c38e6..fea24c7 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
@@ -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/lvpp/VideoEditorAudioPlayer.h b/libvideoeditor/lvpp/VideoEditorAudioPlayer.h
index 73aea65..b7eaa31 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.h
@@ -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/lvpp/VideoEditorBGAudioProcessing.cpp b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
index bcdc3de..80dc9f9 100755
--- a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
+++ b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
@@ -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/lvpp/VideoEditorBGAudioProcessing.h b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
index 1015721..c3a565e 100755
--- a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
+++ b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
@@ -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/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
index 912aab0..452b32d 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
@@ -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/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h
index 349f7fd..2c7838e 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.h
@@ -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/lvpp/VideoEditorPreviewController.cpp b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
index b12d8fe..09b9bfb 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
@@ -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/lvpp/VideoEditorPreviewController.h b/libvideoeditor/lvpp/VideoEditorPreviewController.h
index 4c62ac5..772aaff 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.h
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.h
@@ -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/lvpp/VideoEditorSRC.cpp b/libvideoeditor/lvpp/VideoEditorSRC.cpp
index c304ca2..17eb55a 100755
--- a/libvideoeditor/lvpp/VideoEditorSRC.cpp
+++ b/libvideoeditor/lvpp/VideoEditorSRC.cpp
@@ -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/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h
index 8bfd991..85829e7 100755
--- a/libvideoeditor/lvpp/VideoEditorSRC.h
+++ b/libvideoeditor/lvpp/VideoEditorSRC.h
@@ -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/lvpp/VideoEditorTools.cpp b/libvideoeditor/lvpp/VideoEditorTools.cpp
index ad5cbc5..3f5f6f8 100755
--- a/libvideoeditor/lvpp/VideoEditorTools.cpp
+++ b/libvideoeditor/lvpp/VideoEditorTools.cpp
@@ -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/lvpp/VideoEditorTools.h b/libvideoeditor/lvpp/VideoEditorTools.h
index 5140e8b..6d70473 100755
--- a/libvideoeditor/lvpp/VideoEditorTools.h
+++ b/libvideoeditor/lvpp/VideoEditorTools.h
@@ -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/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");
diff --git a/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Types.h b/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Types.h
index 9eb3166..5f9d16b 100755
--- a/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Types.h
+++ b/libvideoeditor/vss/3gpwriter/inc/M4MP4W_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/vss/3gpwriter/inc/M4MP4W_Utils.h b/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Utils.h
index c7d55f2..fbe7abb 100755
--- a/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Utils.h
+++ b/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Utils.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/vss/3gpwriter/inc/M4MP4W_Writer.h b/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Writer.h
index 715a7c6..b73a223 100755
--- a/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Writer.h
+++ b/libvideoeditor/vss/3gpwriter/inc/M4MP4W_Writer.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/vss/3gpwriter/src/Android.mk b/libvideoeditor/vss/3gpwriter/src/Android.mk
index 75971b3..61d7d6a 100755
--- a/libvideoeditor/vss/3gpwriter/src/Android.mk
+++ b/libvideoeditor/vss/3gpwriter/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/vss/3gpwriter/src/M4MP4W_Interface.c b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Interface.c
index 7fde1f1..c2c5250 100755
--- a/libvideoeditor/vss/3gpwriter/src/M4MP4W_Interface.c
+++ b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Interface.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/vss/3gpwriter/src/M4MP4W_Utils.c b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
index 4ec4f64..62e2ad0 100755
--- a/libvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
+++ b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.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/vss/3gpwriter/src/M4MP4W_Writer.c b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
index cb0c84f..9ad94e0 100755
--- a/libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
+++ b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.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/vss/common/inc/From2iToMono_16.h b/libvideoeditor/vss/common/inc/From2iToMono_16.h
index 433bb78..c6ffb3f 100755
--- a/libvideoeditor/vss/common/inc/From2iToMono_16.h
+++ b/libvideoeditor/vss/common/inc/From2iToMono_16.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/vss/common/inc/LVM_Types.h b/libvideoeditor/vss/common/inc/LVM_Types.h
index a9eecef..a28974d 100755
--- a/libvideoeditor/vss/common/inc/LVM_Types.h
+++ b/libvideoeditor/vss/common/inc/LVM_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/vss/common/inc/M4AD_Common.h b/libvideoeditor/vss/common/inc/M4AD_Common.h
index 12314f3..185ad87 100755
--- a/libvideoeditor/vss/common/inc/M4AD_Common.h
+++ b/libvideoeditor/vss/common/inc/M4AD_Common.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/vss/common/inc/M4AD_Null.h b/libvideoeditor/vss/common/inc/M4AD_Null.h
index d00d6d7..78140cd 100755
--- a/libvideoeditor/vss/common/inc/M4AD_Null.h
+++ b/libvideoeditor/vss/common/inc/M4AD_Null.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/vss/common/inc/M4AIR_API.h b/libvideoeditor/vss/common/inc/M4AIR_API.h
index 954b77a..7541362 100755
--- a/libvideoeditor/vss/common/inc/M4AIR_API.h
+++ b/libvideoeditor/vss/common/inc/M4AIR_API.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/vss/common/inc/M4AMRR_CoreReader.h b/libvideoeditor/vss/common/inc/M4AMRR_CoreReader.h
index 8f0ca62..9d710f3 100755
--- a/libvideoeditor/vss/common/inc/M4AMRR_CoreReader.h
+++ b/libvideoeditor/vss/common/inc/M4AMRR_CoreReader.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/vss/common/inc/M4Common_types.h b/libvideoeditor/vss/common/inc/M4Common_types.h
index 0ae59ee..9e6a0fb 100755
--- a/libvideoeditor/vss/common/inc/M4Common_types.h
+++ b/libvideoeditor/vss/common/inc/M4Common_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/vss/common/inc/M4DA_Types.h b/libvideoeditor/vss/common/inc/M4DA_Types.h
index 0779bf9..7f182e0 100755
--- a/libvideoeditor/vss/common/inc/M4DA_Types.h
+++ b/libvideoeditor/vss/common/inc/M4DA_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/vss/common/inc/M4DECODER_Common.h b/libvideoeditor/vss/common/inc/M4DECODER_Common.h
index 889efd5..1ccde6d 100755
--- a/libvideoeditor/vss/common/inc/M4DECODER_Common.h
+++ b/libvideoeditor/vss/common/inc/M4DECODER_Common.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/vss/common/inc/M4ENCODER_AudioCommon.h b/libvideoeditor/vss/common/inc/M4ENCODER_AudioCommon.h
index f63bcfe..cba02a0 100755
--- a/libvideoeditor/vss/common/inc/M4ENCODER_AudioCommon.h
+++ b/libvideoeditor/vss/common/inc/M4ENCODER_AudioCommon.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/vss/common/inc/M4ENCODER_common.h b/libvideoeditor/vss/common/inc/M4ENCODER_common.h
index 75d1c31..61beefe 100755
--- a/libvideoeditor/vss/common/inc/M4ENCODER_common.h
+++ b/libvideoeditor/vss/common/inc/M4ENCODER_common.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/vss/common/inc/M4OSA_CoreID.h b/libvideoeditor/vss/common/inc/M4OSA_CoreID.h
index 425c8ec..7408fc8 100755
--- a/libvideoeditor/vss/common/inc/M4OSA_CoreID.h
+++ b/libvideoeditor/vss/common/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/vss/common/inc/M4PCMR_CoreReader.h b/libvideoeditor/vss/common/inc/M4PCMR_CoreReader.h
index 78fe910..6afc50c 100755
--- a/libvideoeditor/vss/common/inc/M4PCMR_CoreReader.h
+++ b/libvideoeditor/vss/common/inc/M4PCMR_CoreReader.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/vss/common/inc/M4READER_3gpCom.h b/libvideoeditor/vss/common/inc/M4READER_3gpCom.h
index ab07d50..22a5a03 100755
--- a/libvideoeditor/vss/common/inc/M4READER_3gpCom.h
+++ b/libvideoeditor/vss/common/inc/M4READER_3gpCom.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/vss/common/inc/M4READER_Amr.h b/libvideoeditor/vss/common/inc/M4READER_Amr.h
index 630f657..b6e7f97 100755
--- a/libvideoeditor/vss/common/inc/M4READER_Amr.h
+++ b/libvideoeditor/vss/common/inc/M4READER_Amr.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/vss/common/inc/M4READER_Common.h b/libvideoeditor/vss/common/inc/M4READER_Common.h
index cf310a5..8863a7e 100755
--- a/libvideoeditor/vss/common/inc/M4READER_Common.h
+++ b/libvideoeditor/vss/common/inc/M4READER_Common.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/vss/common/inc/M4READER_Pcm.h b/libvideoeditor/vss/common/inc/M4READER_Pcm.h
index a600b34..f0fc857 100755
--- a/libvideoeditor/vss/common/inc/M4READER_Pcm.h
+++ b/libvideoeditor/vss/common/inc/M4READER_Pcm.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/vss/common/inc/M4SYS_AccessUnit.h b/libvideoeditor/vss/common/inc/M4SYS_AccessUnit.h
index 74da266..f50367c 100755
--- a/libvideoeditor/vss/common/inc/M4SYS_AccessUnit.h
+++ b/libvideoeditor/vss/common/inc/M4SYS_AccessUnit.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/vss/common/inc/M4SYS_Stream.h b/libvideoeditor/vss/common/inc/M4SYS_Stream.h
index 5ed9f82..bab0ce7 100755
--- a/libvideoeditor/vss/common/inc/M4SYS_Stream.h
+++ b/libvideoeditor/vss/common/inc/M4SYS_Stream.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/vss/common/inc/M4TOOL_VersionInfo.h b/libvideoeditor/vss/common/inc/M4TOOL_VersionInfo.h
index 2661016..7016b8d 100755
--- a/libvideoeditor/vss/common/inc/M4TOOL_VersionInfo.h
+++ b/libvideoeditor/vss/common/inc/M4TOOL_VersionInfo.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/vss/common/inc/M4VD_EXTERNAL_Interface.h b/libvideoeditor/vss/common/inc/M4VD_EXTERNAL_Interface.h
index 90df82b..db48207 100755
--- a/libvideoeditor/vss/common/inc/M4VD_EXTERNAL_Interface.h
+++ b/libvideoeditor/vss/common/inc/M4VD_EXTERNAL_Interface.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/vss/common/inc/M4VD_Tools.h b/libvideoeditor/vss/common/inc/M4VD_Tools.h
index 83e036a..3ca36ac 100755
--- a/libvideoeditor/vss/common/inc/M4VD_Tools.h
+++ b/libvideoeditor/vss/common/inc/M4VD_Tools.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/vss/common/inc/M4VFL_transition.h b/libvideoeditor/vss/common/inc/M4VFL_transition.h
index 294de6f..b405279 100755
--- a/libvideoeditor/vss/common/inc/M4VFL_transition.h
+++ b/libvideoeditor/vss/common/inc/M4VFL_transition.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/vss/common/inc/M4VIFI_Clip.h b/libvideoeditor/vss/common/inc/M4VIFI_Clip.h
index 13997ac..1f07616 100755
--- a/libvideoeditor/vss/common/inc/M4VIFI_Clip.h
+++ b/libvideoeditor/vss/common/inc/M4VIFI_Clip.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/vss/common/inc/M4VIFI_Defines.h b/libvideoeditor/vss/common/inc/M4VIFI_Defines.h
index d670791..e4591e5 100755
--- a/libvideoeditor/vss/common/inc/M4VIFI_Defines.h
+++ b/libvideoeditor/vss/common/inc/M4VIFI_Defines.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/vss/common/inc/M4VIFI_FiltersAPI.h b/libvideoeditor/vss/common/inc/M4VIFI_FiltersAPI.h
index 390c6e4..3d2fc9d 100755
--- a/libvideoeditor/vss/common/inc/M4VIFI_FiltersAPI.h
+++ b/libvideoeditor/vss/common/inc/M4VIFI_FiltersAPI.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/vss/common/inc/M4VPP_API.h b/libvideoeditor/vss/common/inc/M4VPP_API.h
index a231d34..965ca22 100755
--- a/libvideoeditor/vss/common/inc/M4VPP_API.h
+++ b/libvideoeditor/vss/common/inc/M4VPP_API.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/vss/common/inc/M4WRITER_common.h b/libvideoeditor/vss/common/inc/M4WRITER_common.h
index 779968b..abb7b86 100755
--- a/libvideoeditor/vss/common/inc/M4WRITER_common.h
+++ b/libvideoeditor/vss/common/inc/M4WRITER_common.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/vss/common/inc/M4_BitStreamParser.h b/libvideoeditor/vss/common/inc/M4_BitStreamParser.h
index 0e7dfb0..c875458 100755
--- a/libvideoeditor/vss/common/inc/M4_BitStreamParser.h
+++ b/libvideoeditor/vss/common/inc/M4_BitStreamParser.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/vss/common/inc/M4_Common.h b/libvideoeditor/vss/common/inc/M4_Common.h
index 6e1d42f..760a7da 100755
--- a/libvideoeditor/vss/common/inc/M4_Common.h
+++ b/libvideoeditor/vss/common/inc/M4_Common.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/vss/common/inc/M4_Utils.h b/libvideoeditor/vss/common/inc/M4_Utils.h
index ec4bfb7..a1e0829 100755
--- a/libvideoeditor/vss/common/inc/M4_Utils.h
+++ b/libvideoeditor/vss/common/inc/M4_Utils.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/vss/common/inc/M4_VideoEditingCommon.h b/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
index 79831bb..007b4b4 100755
--- a/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
+++ b/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.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/vss/common/inc/MonoTo2I_16.h b/libvideoeditor/vss/common/inc/MonoTo2I_16.h
index 386b353..74b1c8a 100755
--- a/libvideoeditor/vss/common/inc/MonoTo2I_16.h
+++ b/libvideoeditor/vss/common/inc/MonoTo2I_16.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/vss/common/inc/NXPSW_CompilerSwitches.h b/libvideoeditor/vss/common/inc/NXPSW_CompilerSwitches.h
index 46a7efc..13cac6d 100755
--- a/libvideoeditor/vss/common/inc/NXPSW_CompilerSwitches.h
+++ b/libvideoeditor/vss/common/inc/NXPSW_CompilerSwitches.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/vss/common/inc/NXPSW_CompilerSwitches_MCS.h b/libvideoeditor/vss/common/inc/NXPSW_CompilerSwitches_MCS.h
index 028cd27..86a325f 100755
--- a/libvideoeditor/vss/common/inc/NXPSW_CompilerSwitches_MCS.h
+++ b/libvideoeditor/vss/common/inc/NXPSW_CompilerSwitches_MCS.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/vss/common/inc/SSRC.h b/libvideoeditor/vss/common/inc/SSRC.h
index 16ca3f6..2b1cfcf 100755
--- a/libvideoeditor/vss/common/inc/SSRC.h
+++ b/libvideoeditor/vss/common/inc/SSRC.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/vss/common/inc/VideoEditorResampler.h b/libvideoeditor/vss/common/inc/VideoEditorResampler.h
index c4e3a89..b8497d3 100755
--- a/libvideoeditor/vss/common/inc/VideoEditorResampler.h
+++ b/libvideoeditor/vss/common/inc/VideoEditorResampler.h
@@ -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/vss/common/inc/marker.h b/libvideoeditor/vss/common/inc/marker.h
index d63ba8c..83cade0 100755
--- a/libvideoeditor/vss/common/inc/marker.h
+++ b/libvideoeditor/vss/common/inc/marker.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/vss/inc/M4EXIFC_CommonAPI.h b/libvideoeditor/vss/inc/M4EXIFC_CommonAPI.h
index ae21d95..e23c02a 100755
--- a/libvideoeditor/vss/inc/M4EXIFC_CommonAPI.h
+++ b/libvideoeditor/vss/inc/M4EXIFC_CommonAPI.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/vss/inc/M4PTO3GPP_API.h b/libvideoeditor/vss/inc/M4PTO3GPP_API.h
index 693f249..e81bc6d 100755
--- a/libvideoeditor/vss/inc/M4PTO3GPP_API.h
+++ b/libvideoeditor/vss/inc/M4PTO3GPP_API.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/vss/inc/M4PTO3GPP_ErrorCodes.h b/libvideoeditor/vss/inc/M4PTO3GPP_ErrorCodes.h
index 555a7d3..57bd54f 100755
--- a/libvideoeditor/vss/inc/M4PTO3GPP_ErrorCodes.h
+++ b/libvideoeditor/vss/inc/M4PTO3GPP_ErrorCodes.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/vss/inc/M4PTO3GPP_InternalTypes.h b/libvideoeditor/vss/inc/M4PTO3GPP_InternalTypes.h
index e6e830d..592e566 100755
--- a/libvideoeditor/vss/inc/M4PTO3GPP_InternalTypes.h
+++ b/libvideoeditor/vss/inc/M4PTO3GPP_InternalTypes.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/vss/inc/M4VSS3GPP_API.h b/libvideoeditor/vss/inc/M4VSS3GPP_API.h
index a1cf225..8865a3c 100755
--- a/libvideoeditor/vss/inc/M4VSS3GPP_API.h
+++ b/libvideoeditor/vss/inc/M4VSS3GPP_API.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/vss/inc/M4VSS3GPP_ErrorCodes.h b/libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
index 7f3188a..b652d44 100755
--- a/libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
+++ b/libvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.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/vss/inc/M4VSS3GPP_Extended_API.h b/libvideoeditor/vss/inc/M4VSS3GPP_Extended_API.h
index faecb91..ee750c4 100755
--- a/libvideoeditor/vss/inc/M4VSS3GPP_Extended_API.h
+++ b/libvideoeditor/vss/inc/M4VSS3GPP_Extended_API.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/vss/inc/M4VSS3GPP_InternalConfig.h b/libvideoeditor/vss/inc/M4VSS3GPP_InternalConfig.h
index 3926427..2669feb 100755
--- a/libvideoeditor/vss/inc/M4VSS3GPP_InternalConfig.h
+++ b/libvideoeditor/vss/inc/M4VSS3GPP_InternalConfig.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/vss/inc/M4VSS3GPP_InternalFunctions.h b/libvideoeditor/vss/inc/M4VSS3GPP_InternalFunctions.h
index ea09caa..e855882 100755
--- a/libvideoeditor/vss/inc/M4VSS3GPP_InternalFunctions.h
+++ b/libvideoeditor/vss/inc/M4VSS3GPP_InternalFunctions.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/vss/inc/M4VSS3GPP_InternalTypes.h b/libvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
index f01e371..d621a1b 100755
--- a/libvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
+++ b/libvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.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/vss/inc/M4xVSS_API.h b/libvideoeditor/vss/inc/M4xVSS_API.h
index a66211b..66d8c0f 100755
--- a/libvideoeditor/vss/inc/M4xVSS_API.h
+++ b/libvideoeditor/vss/inc/M4xVSS_API.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/vss/inc/M4xVSS_Internal.h b/libvideoeditor/vss/inc/M4xVSS_Internal.h
index e999867..e8013f4 100755
--- a/libvideoeditor/vss/inc/M4xVSS_Internal.h
+++ b/libvideoeditor/vss/inc/M4xVSS_Internal.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/vss/mcs/inc/M4MCS_API.h b/libvideoeditor/vss/mcs/inc/M4MCS_API.h
index 7fb64e8..b5d7212 100755
--- a/libvideoeditor/vss/mcs/inc/M4MCS_API.h
+++ b/libvideoeditor/vss/mcs/inc/M4MCS_API.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/vss/mcs/inc/M4MCS_ErrorCodes.h b/libvideoeditor/vss/mcs/inc/M4MCS_ErrorCodes.h
index cd3a7f3..c042dbb 100755
--- a/libvideoeditor/vss/mcs/inc/M4MCS_ErrorCodes.h
+++ b/libvideoeditor/vss/mcs/inc/M4MCS_ErrorCodes.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/vss/mcs/inc/M4MCS_InternalConfig.h b/libvideoeditor/vss/mcs/inc/M4MCS_InternalConfig.h
index d3e75b6..efaf1e6 100755
--- a/libvideoeditor/vss/mcs/inc/M4MCS_InternalConfig.h
+++ b/libvideoeditor/vss/mcs/inc/M4MCS_InternalConfig.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/vss/mcs/inc/M4MCS_InternalFunctions.h b/libvideoeditor/vss/mcs/inc/M4MCS_InternalFunctions.h
index 597a591..21c679e 100755
--- a/libvideoeditor/vss/mcs/inc/M4MCS_InternalFunctions.h
+++ b/libvideoeditor/vss/mcs/inc/M4MCS_InternalFunctions.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/vss/mcs/inc/M4MCS_InternalTypes.h b/libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
index ca63cc0..5a12f69 100755
--- a/libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
+++ b/libvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.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/vss/mcs/src/Android.mk b/libvideoeditor/vss/mcs/src/Android.mk
index d1d48bb..0bfc0b6 100755
--- a/libvideoeditor/vss/mcs/src/Android.mk
+++ b/libvideoeditor/vss/mcs/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/vss/mcs/src/M4MCS_API.c b/libvideoeditor/vss/mcs/src/M4MCS_API.c
index 8bed904..d8d47f1 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_API.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_API.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/vss/mcs/src/M4MCS_AudioEffects.c b/libvideoeditor/vss/mcs/src/M4MCS_AudioEffects.c
index f2e0373..488de68 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_AudioEffects.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_AudioEffects.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/vss/mcs/src/M4MCS_Codecs.c b/libvideoeditor/vss/mcs/src/M4MCS_Codecs.c
index cbff66c..9a00f38 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_Codecs.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_Codecs.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/vss/mcs/src/M4MCS_MediaAndCodecSubscription.c b/libvideoeditor/vss/mcs/src/M4MCS_MediaAndCodecSubscription.c
index d6a9e09..631ca87 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_MediaAndCodecSubscription.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_MediaAndCodecSubscription.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/vss/mcs/src/M4MCS_VideoPreProcessing.c b/libvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
index 36ad9d9..749f68e 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.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/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk
index 41cd15d..ba59088 100755
--- a/libvideoeditor/vss/src/Android.mk
+++ b/libvideoeditor/vss/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/vss/src/M4AD_Null.c b/libvideoeditor/vss/src/M4AD_Null.c
index 5620358..cd1ec73 100755
--- a/libvideoeditor/vss/src/M4AD_Null.c
+++ b/libvideoeditor/vss/src/M4AD_Null.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/vss/src/M4AIR_API.c b/libvideoeditor/vss/src/M4AIR_API.c
index cb423e0..62897b0 100755
--- a/libvideoeditor/vss/src/M4AIR_API.c
+++ b/libvideoeditor/vss/src/M4AIR_API.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/vss/src/M4AMRR_CoreReader.c b/libvideoeditor/vss/src/M4AMRR_CoreReader.c
index db2100f..630f9dc 100755
--- a/libvideoeditor/vss/src/M4AMRR_CoreReader.c
+++ b/libvideoeditor/vss/src/M4AMRR_CoreReader.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/vss/src/M4ChannelConverter.c b/libvideoeditor/vss/src/M4ChannelConverter.c
index 5d89820..fca5550 100755
--- a/libvideoeditor/vss/src/M4ChannelConverter.c
+++ b/libvideoeditor/vss/src/M4ChannelConverter.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/vss/src/M4PCMR_CoreReader.c b/libvideoeditor/vss/src/M4PCMR_CoreReader.c
index efde770..3343254 100755
--- a/libvideoeditor/vss/src/M4PCMR_CoreReader.c
+++ b/libvideoeditor/vss/src/M4PCMR_CoreReader.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/vss/src/M4PTO3GPP_API.c b/libvideoeditor/vss/src/M4PTO3GPP_API.c
index 2ce22f6..3ecb2e3 100755
--- a/libvideoeditor/vss/src/M4PTO3GPP_API.c
+++ b/libvideoeditor/vss/src/M4PTO3GPP_API.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/vss/src/M4PTO3GPP_VideoPreProcessing.c b/libvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
index 53fb5c9..96a6498 100755
--- a/libvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
+++ b/libvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.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/vss/src/M4READER_Amr.c b/libvideoeditor/vss/src/M4READER_Amr.c
index a7cd653..0859157 100755
--- a/libvideoeditor/vss/src/M4READER_Amr.c
+++ b/libvideoeditor/vss/src/M4READER_Amr.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/vss/src/M4READER_Pcm.c b/libvideoeditor/vss/src/M4READER_Pcm.c
index 9f2e5b3..833930b 100755
--- a/libvideoeditor/vss/src/M4READER_Pcm.c
+++ b/libvideoeditor/vss/src/M4READER_Pcm.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/vss/src/M4VD_EXTERNAL_BitstreamParser.c b/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
index c8a8aca..4150070 100755
--- a/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
+++ b/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.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/vss/src/M4VD_Tools.c b/libvideoeditor/vss/src/M4VD_Tools.c
index 4a737b2..fdb4b41 100755
--- a/libvideoeditor/vss/src/M4VD_Tools.c
+++ b/libvideoeditor/vss/src/M4VD_Tools.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/vss/src/M4VIFI_xVSS_RGB565toYUV420.c b/libvideoeditor/vss/src/M4VIFI_xVSS_RGB565toYUV420.c
index 881da82..86bb46b 100755
--- a/libvideoeditor/vss/src/M4VIFI_xVSS_RGB565toYUV420.c
+++ b/libvideoeditor/vss/src/M4VIFI_xVSS_RGB565toYUV420.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/vss/src/M4VSS3GPP_AudioMixing.c b/libvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
index 877dd97..c2bdd75 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_AudioMixing.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/vss/src/M4VSS3GPP_Clip.c b/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
index d9b6eb5..69e0aab 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_Clip.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/vss/src/M4VSS3GPP_ClipAnalysis.c b/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
index 3de1322..248ab61 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.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/vss/src/M4VSS3GPP_Codecs.c b/libvideoeditor/vss/src/M4VSS3GPP_Codecs.c
index aaa621e..10cb76e 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_Codecs.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_Codecs.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/vss/src/M4VSS3GPP_Edit.c b/libvideoeditor/vss/src/M4VSS3GPP_Edit.c
index efdda9b..f8d4fb6 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_Edit.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_Edit.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/vss/src/M4VSS3GPP_EditAudio.c b/libvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
index 103a5ea..85b939d 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_EditAudio.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/vss/src/M4VSS3GPP_EditVideo.c b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
index f69f14b..19ed65b 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.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/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c b/libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
index df14a54..ea13c9e 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.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/vss/src/M4xVSS_API.c b/libvideoeditor/vss/src/M4xVSS_API.c
index e99cfe5..8def0c6 100755
--- a/libvideoeditor/vss/src/M4xVSS_API.c
+++ b/libvideoeditor/vss/src/M4xVSS_API.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/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c
index 391c945..a490cdc 100755
--- a/libvideoeditor/vss/src/M4xVSS_internal.c
+++ b/libvideoeditor/vss/src/M4xVSS_internal.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/vss/src/VideoEditorResampler.cpp b/libvideoeditor/vss/src/VideoEditorResampler.cpp
index c967aaf..6064baf 100755
--- a/libvideoeditor/vss/src/VideoEditorResampler.cpp
+++ b/libvideoeditor/vss/src/VideoEditorResampler.cpp
@@ -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/vss/stagefrightshells/inc/VideoEditor3gpReader.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h
index 73f3958..7a9a012 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h
@@ -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/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h
index 3a0418d..0d3b801 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h
@@ -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/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h
index 009605a..f4f6b04 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h
@@ -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/vss/stagefrightshells/inc/VideoEditorBuffer.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h
index 62433d0..3aff6a7 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h
@@ -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/vss/stagefrightshells/inc/VideoEditorMp3Reader.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h
index 03bb41d..5b3be40 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h
@@ -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/vss/stagefrightshells/inc/VideoEditorUtils.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
index 86d676e..3e61291 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
@@ -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/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h
index f7bc0cb..f4092e2 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h
@@ -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/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
index 251fb4f..7d9281b 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
@@ -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/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h
index 8ba9cd0..fd5154f 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h
@@ -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/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk
index 48e3cd8..2418c89 100755
--- a/libvideoeditor/vss/stagefrightshells/src/Android.mk
+++ b/libvideoeditor/vss/stagefrightshells/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/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
index ea4abce..fd119b1 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
@@ -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/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
index 928f8ea..6d2776f 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
@@ -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/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
index bcae1a8..4d75533 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
@@ -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/vss/stagefrightshells/src/VideoEditorBuffer.c b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
index 37f960a..edd1e7c 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
@@ -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/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
index 1ae567e..e9e23a3 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
@@ -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/vss/stagefrightshells/src/VideoEditorUtils.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
index 733c5d6..875d99d 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
@@ -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/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 3b3f89f..9a6887f 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -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/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
index 0a595a2..a05f48a 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
@@ -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/vss/video_filters/src/Android.mk b/libvideoeditor/vss/video_filters/src/Android.mk
index a933f97..06fd4c4 100755
--- a/libvideoeditor/vss/video_filters/src/Android.mk
+++ b/libvideoeditor/vss/video_filters/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/vss/video_filters/src/M4VFL_transition.c b/libvideoeditor/vss/video_filters/src/M4VFL_transition.c
index 62fff27..eca99bc 100755
--- a/libvideoeditor/vss/video_filters/src/M4VFL_transition.c
+++ b/libvideoeditor/vss/video_filters/src/M4VFL_transition.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/vss/video_filters/src/M4VIFI_BGR565toYUV420.c b/libvideoeditor/vss/video_filters/src/M4VIFI_BGR565toYUV420.c
index f972ba5..c608767 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_BGR565toYUV420.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_BGR565toYUV420.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/vss/video_filters/src/M4VIFI_Clip.c b/libvideoeditor/vss/video_filters/src/M4VIFI_Clip.c
index 800ee1e..e4290b1 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_Clip.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_Clip.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/vss/video_filters/src/M4VIFI_RGB565toYUV420.c b/libvideoeditor/vss/video_filters/src/M4VIFI_RGB565toYUV420.c
index 6192e4e..f0fff16 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_RGB565toYUV420.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_RGB565toYUV420.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/vss/video_filters/src/M4VIFI_RGB888toYUV420.c b/libvideoeditor/vss/video_filters/src/M4VIFI_RGB888toYUV420.c
index d40a488..285a2a6 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_RGB888toYUV420.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_RGB888toYUV420.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/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
index 256687c..728af19 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.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/vss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c
index ebd8b19..deb9d44 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.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/vss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.c b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.c
index 10c0a43..0042e80 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.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/vss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.c b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.c
index c3df5ea..eda9d07 100755
--- a/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.c
+++ b/libvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.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");