Skip to content

Commit 6bc0569

Browse files
committed
1、优化脚本;
1 parent ec9400a commit 6bc0569

File tree

1,056 files changed

+217298
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,056 files changed

+217298
-2
lines changed

Diff for: 4.2/build-ffmpeg-iOS.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ CONFIGURE_FLAGS="--enable-cross-compile --disable-debug --disable-programs --dis
2828

2929
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-encoders --disable-decoders \
3030
--disable-muxers --disable-parsers --disable-filters \
31-
--enable-encoder=h264,aac,libx264,pcm_*,*jpeg*,libopencore_amrnb \
31+
--enable-encoder=h264,aac,libx264,pcm_*,*jpeg*\
3232
--enable-decoder==h264,aac,pcm*,*jpeg*,amr*,hevc \
3333
--enable-muxer=h264,aac,pcm*,flv,mp4,avi,mp3,amr \
3434
--enable-parser=h264,aac,hevc,mpeg4video,*jpeg*,mpeg* \
@@ -70,7 +70,7 @@ then
7070
sh $SHELL_PATH/build-opencore-amr-iOS.sh $BUILD_ARCH $DEPLOYMENT_TARGET
7171
fi
7272
OPENCORE_AMR=$SHELL_PATH/opencore-amr-iOS
73-
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
73+
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-version3 --enable-encoder=libopencore-amrnb,libopencore-amrwb"
7474
fi
7575
#是否编译openssl
7676
#if [ "$BUILD_THIRD_LIB" = "openssl" ] || [ "$BUILD_THIRD_LIB" = "all" ]

Diff for: 4.2/opencore-amr-0.1.5/ChangeLog

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
0.1.5
2+
- Fix an autotools issue with cross compiling from the 0.1.4 release
3+
4+
0.1.4
5+
- Autotools cleanups
6+
- Fixes for SID/DTX in the AMR-WB decoder, fixes for handling of bad
7+
frames in both AMR-WB and AMR-NB
8+
9+
0.1.3
10+
- Adjusted libtool flags for building DLLs for windows
11+
- Update to the latest upstream opencore source
12+
- Updated and improved example applications
13+
- Add options for enabling the arm inline assembly
14+
- Add options for disabling the encoder or decoder in the amrnb library
15+
- Avoid dependencies on libstdc++ if building the source as C
16+
- Hide internal symbols in shared libraries
17+
- Minor tweaks
18+
- Remove old static makefiles and corresponding build scripts
19+
20+
0.1.2
21+
- Fixed AMR-NB encoding on 64-bit architectures
22+
- Switch to using automake/autoconf/libtool
23+
- Update to the latest upstream opencore source as of September 1, 2009
24+
25+
0.1.1
26+
- Rename the libraries from libamr* to libopencore-amr*
27+
- Fix a bunch of compiler warnings
28+
29+
0.1.0
30+
- Start of opencore-amr project.

Diff for: 4.2/opencore-amr-0.1.5/LICENSE

+191
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction, and
10+
distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by the
13+
copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all other
16+
entities that control, are controlled by, or are under common control with
17+
that entity. For the purposes of this definition, "control" means (i) the
18+
power, direct or indirect, to cause the direction or management of such
19+
entity, whether by contract or otherwise, or (ii) ownership of fifty
20+
percent (50%) or more of the outstanding shares, or (iii) beneficial
21+
ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity exercising
24+
permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation source,
28+
and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical transformation
31+
or translation of a Source form, including but not limited to compiled
32+
object code, generated documentation, and conversions to other media types.
33+
34+
"Work" shall mean the work of authorship, whether in Source or Object form,
35+
made available under the License, as indicated by a copyright notice that
36+
is included in or attached to the work (an example is provided in the
37+
Appendix below).
38+
39+
"Derivative Works" shall mean any work, whether in Source or Object form,
40+
that is based on (or derived from) the Work and for which the editorial
41+
revisions, annotations, elaborations, or other modifications represent, as
42+
a whole, an original work of authorship. For the purposes of this License,
43+
Derivative Works shall not include works that remain separable from, or
44+
merely link (or bind by name) to the interfaces of, the Work and Derivative
45+
Works thereof.
46+
47+
"Contribution" shall mean any work of authorship, including the original
48+
version of the Work and any modifications or additions to that Work or
49+
Derivative Works thereof, that is intentionally submitted to Licensor for
50+
inclusion in the Work by the copyright owner or by an individual or Legal
51+
Entity authorized to submit on behalf of the copyright owner. For the
52+
purposes of this definition, "submitted" means any form of electronic,
53+
verbal, or written communication sent to the Licensor or its
54+
representatives, including but not limited to communication on electronic
55+
mailing lists, source code control systems, and issue tracking systems that
56+
are managed by, or on behalf of, the Licensor for the purpose of discussing
57+
and improving the Work, but excluding communication that is conspicuously
58+
marked or otherwise designated in writing by the copyright owner as "Not a
59+
Contribution."
60+
61+
"Contributor" shall mean Licensor and any individual or Legal Entity on
62+
behalf of whom a Contribution has been received by Licensor and
63+
subsequently incorporated within the Work.
64+
65+
2. Grant of Copyright License. Subject to the terms and conditions of this
66+
License, each Contributor hereby grants to You a perpetual, worldwide,
67+
non-exclusive, no-charge, royalty-free, irrevocable copyright license to
68+
reproduce, prepare Derivative Works of, publicly display, publicly perform,
69+
sublicense, and distribute the Work and such Derivative Works in Source or
70+
Object form.
71+
72+
3. Grant of Patent License. Subject to the terms and conditions of this
73+
License, each Contributor hereby grants to You a perpetual, worldwide,
74+
non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
75+
this section) patent license to make, have made, use, offer to sell, sell,
76+
import, and otherwise transfer the Work, where such license applies only to
77+
those patent claims licensable by such Contributor that are necessarily
78+
infringed by their Contribution(s) alone or by combination of their
79+
Contribution(s) with the Work to which such Contribution(s) was submitted.
80+
If You institute patent litigation against any entity (including a
81+
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
82+
Contribution incorporated within the Work constitutes direct or
83+
contributory patent infringement, then any patent licenses granted to You
84+
under this License for that Work shall terminate as of the date such
85+
litigation is filed.
86+
87+
4. Redistribution. You may reproduce and distribute copies of the Work or
88+
Derivative Works thereof in any medium, with or without modifications, and
89+
in Source or Object form, provided that You meet the following conditions:
90+
91+
1. You must give any other recipients of the Work or Derivative Works a
92+
copy of this License; and
93+
94+
2. You must cause any modified files to carry prominent notices stating
95+
that You changed the files; and
96+
97+
3. You must retain, in the Source form of any Derivative Works that You
98+
distribute, all copyright, patent, trademark, and attribution notices from
99+
the Source form of the Work, excluding those notices that do not pertain to
100+
any part of the Derivative Works; and
101+
102+
4. If the Work includes a "NOTICE" text file as part of its
103+
distribution, then any Derivative Works that You distribute must include a
104+
readable copy of the attribution notices contained within such NOTICE file,
105+
excluding those notices that do not pertain to any part of the Derivative
106+
Works, in at least one of the following places: within a NOTICE text file
107+
distributed as part of the Derivative Works; within the Source form or
108+
documentation, if provided along with the Derivative Works; or, within a
109+
display generated by the Derivative Works, if and wherever such third-party
110+
notices normally appear. The contents of the NOTICE file are for
111+
informational purposes only and do not modify the License. You may add Your
112+
own attribution notices within Derivative Works that You distribute,
113+
alongside or as an addendum to the NOTICE text from the Work, provided that
114+
such additional attribution notices cannot be construed as modifying the
115+
License.
116+
117+
You may add Your own copyright statement to Your modifications and may
118+
provide additional or different license terms and conditions for use,
119+
reproduction, or distribution of Your modifications, or for any such
120+
Derivative Works as a whole, provided Your use, reproduction, and
121+
distribution of the Work otherwise complies with the conditions stated in
122+
this License.
123+
124+
5. Submission of Contributions. Unless You explicitly state otherwise, any
125+
Contribution intentionally submitted for inclusion in the Work by You to
126+
the Licensor shall be under the terms and conditions of this License,
127+
without any additional terms or conditions. Notwithstanding the above,
128+
nothing herein shall supersede or modify the terms of any separate license
129+
agreement you may have executed with Licensor regarding such Contributions.
130+
131+
6. Trademarks. This License does not grant permission to use the trade
132+
names, trademarks, service marks, or product names of the Licensor, except
133+
as required for reasonable and customary use in describing the origin of
134+
the Work and reproducing the content of the NOTICE file.
135+
136+
7. Disclaimer of Warranty. Unless required by applicable law or agreed to
137+
in writing, Licensor provides the Work (and each Contributor provides its
138+
Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
139+
KIND, either express or implied, including, without limitation, any
140+
warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
141+
FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for
142+
determining the appropriateness of using or redistributing the Work and
143+
assume any risks associated with Your exercise of permissions under this
144+
License.
145+
146+
8. Limitation of Liability. In no event and under no legal theory, whether
147+
in tort (including negligence), contract, or otherwise, unless required by
148+
applicable law (such as deliberate and grossly negligent acts) or agreed to
149+
in writing, shall any Contributor be liable to You for damages, including
150+
any direct, indirect, special, incidental, or consequential damages of any
151+
character arising as a result of this License or out of the use or
152+
inability to use the Work (including but not limited to damages for loss of
153+
goodwill, work stoppage, computer failure or malfunction, or any and all
154+
other commercial damages or losses), even if such Contributor has been
155+
advised of the possibility of such damages.
156+
157+
9. Accepting Warranty or Additional Liability. While redistributing the
158+
Work or Derivative Works thereof, You may choose to offer, and charge a fee
159+
for, acceptance of support, warranty, indemnity, or other liability
160+
obligations and/or rights consistent with this License. However, in
161+
accepting such obligations, You may act only on Your own behalf and on Your
162+
sole responsibility, not on behalf of any other Contributor, and only if
163+
You agree to indemnify, defend, and hold each Contributor harmless for any
164+
liability incurred by, or claims asserted against, such Contributor by
165+
reason of your accepting any such warranty or additional liability.
166+
167+
END OF TERMS AND CONDITIONS
168+
169+
APPENDIX: How to apply the Apache License to your work
170+
171+
To apply the Apache License to your work, attach the following boilerplate
172+
notice, with the fields enclosed by brackets "[]" replaced with your own
173+
identifying information. (Don't include the brackets!) The text should be
174+
enclosed in the appropriate comment syntax for the file format. We also
175+
recommend that a file or class name and description of purpose be included
176+
on the same "printed page" as the copyright notice for easier
177+
identification within third-party archives.
178+
179+
Copyright [yyyy] [name of copyright owner]
180+
181+
Licensed under the Apache License, Version 2.0 (the "License"); you may
182+
not use this file except in compliance with the License. You may obtain a
183+
copy of the License at
184+
185+
http://www.apache.org/licenses/LICENSE-2.0
186+
187+
Unless required by applicable
188+
law or agreed to in writing, software distributed under the License is
189+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
190+
KIND, either express or implied. See the License for the specific language
191+
governing permissions and limitations under the License.

0 commit comments

Comments
 (0)