aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordvdli <70133153+dvdli@users.noreply.github.com>2021-07-15 18:27:17 +0800
committerGitHub <noreply@github.com>2021-07-15 18:27:17 +0800
commit597934fc7c722bc2f9e1f933e1f03a9853159f93 (patch)
tree7de2e4dd5c8e46e9a153a07a790eb4b64a19446a
parent53fc3daace2a7fbf7dc0584db291dd6fac17e9c9 (diff)
parent4d1888a467d428156a7a718fe69c78736a8050ac (diff)
Merge pull request #213 from dvdli/fix-license
update NOTICE file and format license header
-rw-r--r--NOTICE2
-rw-r--r--examples/plugins/sample_mixer_plugin.c3
-rw-r--r--examples/plugins/sample_pcm_plugin.c3
-rw-r--r--examples/sndcardparser/sample_sndcardparser.c3
-rw-r--r--src/pcm_hw.c2
5 files changed, 9 insertions, 4 deletions
diff --git a/NOTICE b/NOTICE
index 5debd99..5e78690 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,5 @@
Copyright 2011, The Android Open Source Project
+Copyright (c) 2019, The Linux Foundation.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -22,4 +23,3 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
-
diff --git a/examples/plugins/sample_mixer_plugin.c b/examples/plugins/sample_mixer_plugin.c
index e1a7567..8ecf56d 100644
--- a/examples/plugins/sample_mixer_plugin.c
+++ b/examples/plugins/sample_mixer_plugin.c
@@ -1,4 +1,5 @@
-/*
+/* sample_mixer_plugin.c
+**
** Copyright (c) 2021, The Linux Foundation. All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/examples/plugins/sample_pcm_plugin.c b/examples/plugins/sample_pcm_plugin.c
index 3b02435..40bf684 100644
--- a/examples/plugins/sample_pcm_plugin.c
+++ b/examples/plugins/sample_pcm_plugin.c
@@ -1,4 +1,5 @@
-/*
+/* sample_mixer_plugin.c
+**
** Copyright (c) 2021, The Linux Foundation. All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/examples/sndcardparser/sample_sndcardparser.c b/examples/sndcardparser/sample_sndcardparser.c
index 90e3d12..b7d7381 100644
--- a/examples/sndcardparser/sample_sndcardparser.c
+++ b/examples/sndcardparser/sample_sndcardparser.c
@@ -1,4 +1,5 @@
-/*
+/* sample_sndcardparser.c
+**
** Copyright (c) 2021, The Linux Foundation. All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/pcm_hw.c b/src/pcm_hw.c
index e5588a0..5eb53be 100644
--- a/src/pcm_hw.c
+++ b/src/pcm_hw.c
@@ -1,5 +1,7 @@
/* pcm_hw.c
+**
** Copyright (c) 2019, The Linux Foundation.
+** Copyright 2021, The Android Open Source Project
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are