Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev (0c11001c) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM.h

+16 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007-2008 ARM Limited
		*
		* 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.
		*
		*/
		/**
		*
		* File Name: armCOMM.h
		@@ -5,7 +21,6 @@
		* Revision: 9641
		* Date: Thursday, February 7, 2008
		*
		* (c) Copyright 2007-2008 ARM Limited. All Rights Reserved.
		*
		*
		*

+16 −2

Original line number	Diff line number	Diff line
		;//
		;// Copyright (C) 2007-2008 ARM Limited
		;//
		;// 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.
		;//
		;//
		;//
		;// File Name: armCOMM_BitDec_s.h
		;// OpenMAX DL: v1.0.2
		;// Revision: 9641
		;// Date: Thursday, February 7, 2008
		;//
		;// (c) Copyright 2007-2008 ARM Limited. All Rights Reserved.
		;//
		;//
		;//

+16 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007-2008 ARM Limited
		*
		* 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.
		*
		*/
		/**
		*
		* File Name: armCOMM_Bitstream.h
		@@ -5,7 +21,6 @@
		* Revision: 9641
		* Date: Thursday, February 7, 2008
		*
		* (c) Copyright 2007-2008 ARM Limited. All Rights Reserved.
		*
		*
		*

+16 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007-2008 ARM Limited
		*
		* 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.
		*
		*/
		/**
		*
		*
		@@ -6,7 +22,6 @@
		* Revision: 9641
		* Date: Thursday, February 7, 2008
		*
		* (c) Copyright 2007-2008 ARM Limited. All Rights Reserved.
		*
		*
		*

+15 −7

Original line number	Diff line number	Diff line
		;//
		;// This confidential and proprietary software may be used only as
		;// authorised by a licensing agreement from ARM Limited
		;// (C) COPYRIGHT 2004 ARM Limited
		;// ALL RIGHTS RESERVED
		;// The entire notice above must be reproduced on all authorised
		;// copies and copies may only be made to the extent permitted
		;// by a licensing agreement from ARM Limited.
		;// Copyright (C) 2004 ARM Limited
		;//
		;// 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.
		;//
		;//
		;//
		;// IDCT_s.s
		;//