aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorHo-Eun Ryu <ho-eun.ryu@windriver.com>2010-02-26 16:58:22 +0900
committerPatrick Tjin <pattjin@google.com>2014-07-21 22:03:36 -0700
commit58b405723e007724fd1f336c1286d19e878b058e (patch)
tree4cc58ff29205b4d0b3aec78be6f2c60b9853070b /core
parent2f6e87e64736666857c1bbe2cb0692c1f4e56508 (diff)
downloadwrs_omxil_core-58b405723e007724fd1f336c1286d19e878b058e.tar.gz
khronos: use official khronos openmax-il header
removed trailing whitespace and ^M http://www.khronos.org/files/openmax/headers/omx_il_v1_1/omx_il_v1_1_2_headers.zip
Diffstat (limited to 'core')
-rw-r--r--core/inc/khronos/openmax/include/OMX_Audio.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_Component.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_ContentPipe.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_Core.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_IVCommon.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_Image.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_Index.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_Other.h17
-rw-r--r--core/inc/khronos/openmax/include/OMX_Types.h20
-rw-r--r--core/inc/khronos/openmax/include/OMX_Video.h17
10 files changed, 1 insertions, 172 deletions
diff --git a/core/inc/khronos/openmax/include/OMX_Audio.h b/core/inc/khronos/openmax/include/OMX_Audio.h
index 19d6781..9d084e8 100644
--- a/core/inc/khronos/openmax/include/OMX_Audio.h
+++ b/core/inc/khronos/openmax/include/OMX_Audio.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/*
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_Component.h b/core/inc/khronos/openmax/include/OMX_Component.h
index c312aef..8526f3a 100644
--- a/core/inc/khronos/openmax/include/OMX_Component.h
+++ b/core/inc/khronos/openmax/include/OMX_Component.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/*
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_ContentPipe.h b/core/inc/khronos/openmax/include/OMX_ContentPipe.h
index 6b1025e..403ea55 100644
--- a/core/inc/khronos/openmax/include/OMX_ContentPipe.h
+++ b/core/inc/khronos/openmax/include/OMX_ContentPipe.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/*
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_Core.h b/core/inc/khronos/openmax/include/OMX_Core.h
index 729dc36..6c858e4 100644
--- a/core/inc/khronos/openmax/include/OMX_Core.h
+++ b/core/inc/khronos/openmax/include/OMX_Core.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/*
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_IVCommon.h b/core/inc/khronos/openmax/include/OMX_IVCommon.h
index 2149c7c..37763ec 100644
--- a/core/inc/khronos/openmax/include/OMX_IVCommon.h
+++ b/core/inc/khronos/openmax/include/OMX_IVCommon.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/**
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_Image.h b/core/inc/khronos/openmax/include/OMX_Image.h
index 23a0209..599fb2d 100644
--- a/core/inc/khronos/openmax/include/OMX_Image.h
+++ b/core/inc/khronos/openmax/include/OMX_Image.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/**
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_Index.h b/core/inc/khronos/openmax/include/OMX_Index.h
index 46c94a6..cb94da2 100644
--- a/core/inc/khronos/openmax/include/OMX_Index.h
+++ b/core/inc/khronos/openmax/include/OMX_Index.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/*
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_Other.h b/core/inc/khronos/openmax/include/OMX_Other.h
index a16e14f..a3abbec 100644
--- a/core/inc/khronos/openmax/include/OMX_Other.h
+++ b/core/inc/khronos/openmax/include/OMX_Other.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/*
* Copyright (c) 2008 The Khronos Group Inc.
*
diff --git a/core/inc/khronos/openmax/include/OMX_Types.h b/core/inc/khronos/openmax/include/OMX_Types.h
index 40433a2..264532d 100644
--- a/core/inc/khronos/openmax/include/OMX_Types.h
+++ b/core/inc/khronos/openmax/include/OMX_Types.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/*
* Copyright (c) 2008 The Khronos Group Inc.
*
@@ -70,8 +53,7 @@ extern "C" {
# ifdef __OMX_EXPORTS
# define OMX_API __declspec(dllexport)
# else
-//# define OMX_API __declspec(dllimport)
-#define OMX_API
+# define OMX_API __declspec(dllimport)
# endif
# else
# ifdef __OMX_EXPORTS
diff --git a/core/inc/khronos/openmax/include/OMX_Video.h b/core/inc/khronos/openmax/include/OMX_Video.h
index 419ccff..af36238 100644
--- a/core/inc/khronos/openmax/include/OMX_Video.h
+++ b/core/inc/khronos/openmax/include/OMX_Video.h
@@ -1,20 +1,3 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
/**
* Copyright (c) 2008 The Khronos Group Inc.
*