Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit f226cd6

Browse files
committed
Test application versions updated.
1 parent 0d02689 commit f226cd6

File tree

7 files changed

+119
-20
lines changed

7 files changed

+119
-20
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ There is an Android test application under the `android/test-app` folder and an
9191
9292
### 3. Versions
9393
94-
- `MobileFFmpeg v1.x` is the current stable, includes `FFmpeg v3.4.4`
94+
- `MobileFFmpeg v1.x` is the previous stable, includes `FFmpeg v3.4.4`
9595
96-
- `MobileFFmpeg v2.x` is the next stable, includes `FFmpeg v4.0.2`
96+
- `MobileFFmpeg v2.x` is the current stable, includes `FFmpeg v4.0.2`
9797
9898
### 4. Building
9999
#### 4.1 Prerequisites

ios/test-app/MobileFFmpegTest.xcodeproj/project.pbxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,15 @@
238238
files = (
239239
);
240240
inputPaths = (
241-
"${SRCROOT}/Pods/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh",
242-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/mobileffmpeg.framework",
243-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavcodec.framework",
244-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavdevice.framework",
245-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavfilter.framework",
246-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavformat.framework",
247-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavutil.framework",
248-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libswresample.framework",
249-
"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libswscale.framework",
241+
"${PODS_ROOT}/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh",
242+
"${PODS_ROOT}/mobile-ffmpeg-full/mobileffmpeg.framework",
243+
"${PODS_ROOT}/mobile-ffmpeg-full/libavcodec.framework",
244+
"${PODS_ROOT}/mobile-ffmpeg-full/libavdevice.framework",
245+
"${PODS_ROOT}/mobile-ffmpeg-full/libavfilter.framework",
246+
"${PODS_ROOT}/mobile-ffmpeg-full/libavformat.framework",
247+
"${PODS_ROOT}/mobile-ffmpeg-full/libavutil.framework",
248+
"${PODS_ROOT}/mobile-ffmpeg-full/libswresample.framework",
249+
"${PODS_ROOT}/mobile-ffmpeg-full/libswscale.framework",
250250
);
251251
name = "[CP] Embed Pods Frameworks";
252252
outputPaths = (
@@ -261,7 +261,7 @@
261261
);
262262
runOnlyForDeploymentPostprocessing = 0;
263263
shellPath = /bin/sh;
264-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh\"\n";
264+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh\"\n";
265265
showEnvVarsInLog = 0;
266266
};
267267
/* End PBXShellScriptBuildPhase section */
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0940"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
18+
BuildableName = "MobileFFmpegTest.app"
19+
BlueprintName = "MobileFFmpegTest"
20+
ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
36+
BuildableName = "MobileFFmpegTest.app"
37+
BlueprintName = "MobileFFmpegTest"
38+
ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
59+
BuildableName = "MobileFFmpegTest.app"
60+
BlueprintName = "MobileFFmpegTest"
61+
ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
78+
BuildableName = "MobileFFmpegTest.app"
79+
BlueprintName = "MobileFFmpegTest"
80+
ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
</ProfileAction>
84+
<AnalyzeAction
85+
buildConfiguration = "Debug">
86+
</AnalyzeAction>
87+
<ArchiveAction
88+
buildConfiguration = "Release"
89+
revealArchiveInOrganizer = "YES">
90+
</ArchiveAction>
91+
</Scheme>

ios/test-app/MobileFFmpegTest.xcodeproj/xcuserdata/taner.xcuserdatad/xcschemes/xcschememanagement.plist

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@
77
<key>MobileFFmpegTest.xcscheme</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>1</integer>
10+
<integer>2</integer>
11+
</dict>
12+
</dict>
13+
<key>SuppressBuildableAutocreation</key>
14+
<dict>
15+
<key>34FAE20F209F7DDD005CE2AE</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
1119
</dict>
1220
</dict>
1321
</dict>

ios/test-app/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ platform :ios, '8.0'
33
use_frameworks!
44

55
target "MobileFFmpegTest" do
6-
pod 'mobile-ffmpeg-full-gpl', '~> 1.1'
6+
pod 'mobile-ffmpeg-full', '~> 1.2'
77
end

ios/test-app/Podfile.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- mobile-ffmpeg-full-gpl (1.1)
2+
- mobile-ffmpeg-full (1.2)
33

44
DEPENDENCIES:
5-
- mobile-ffmpeg-full-gpl (~> 1.0)
5+
- mobile-ffmpeg-full (~> 1.2)
66

77
SPEC REPOS:
88
https://github.com/cocoapods/specs.git:
9-
- mobile-ffmpeg-full-gpl
9+
- mobile-ffmpeg-full
1010

1111
SPEC CHECKSUMS:
12-
mobile-ffmpeg-full-gpl: 11966d35b838105a2a7a7a406273bb1d96471e77
12+
mobile-ffmpeg-full: ec899dc6429f90601ccadf6dbe555a920807f231
1313

14-
PODFILE CHECKSUM: cec5abc94e85ec6e626417604d91207043765613
14+
PODFILE CHECKSUM: e71a0e0713180c5304f217b8a1ccf7dcf3c06e16
1515

16-
COCOAPODS: 1.5.3
16+
COCOAPODS: 1.6.0.beta.1

0 commit comments

Comments
 (0)