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

Commit d634b5d

Browse files
tanersenertanersener
authored
Merge branch 'master' into dev-v3.x
2 parents 9408c5d + d05b375 commit d634b5d

Some content is hidden

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

62 files changed

+96
-444
lines changed

‎android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/MainActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
import com.arthenica.mobileffmpeg.Config;
4343
import com.arthenica.mobileffmpeg.FFmpeg;
44+
import com.arthenica.mobileffmpeg.util.RunCallback;
4445
import com.arthenica.mobileffmpeg.util.AsynchronousTaskService;
4546
import com.arthenica.mobileffmpeg.util.RunCallback;
4647

‎docs/android/doc/html/doxygen.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* The standard CSS for doxygen 1.8.14 */
1+
/* The standard CSS for doxygen 1.8.13 */
22

33
body, table, div, p, dl {
44
font: 400 14px/22px Roboto,sans-serif;

‎docs/android/doc/html/dynsections.js

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
/*
2-
@licstart The following is the entire license notice for the
3-
JavaScript code in this file.
4-
5-
Copyright (C) 1997-2017 by Dimitri van Heesch
6-
7-
This program is free software; you can redistribute it and/or modify
8-
it under the terms of the GNU General Public License as published by
9-
the Free Software Foundation; either version 2 of the License, or
10-
(at your option) any later version.
11-
12-
This program is distributed in the hope that it will be useful,
13-
but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
GNU General Public License for more details.
16-
17-
You should have received a copy of the GNU General Public License along
18-
with this program; if not, write to the Free Software Foundation, Inc.,
19-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20-
21-
@licend The above is the entire license notice
22-
for the JavaScript code in this file
23-
*/
241
function toggleVisibility(linkObj)
252
{
263
var base = $(linkObj).attr('id');
@@ -38,7 +15,7 @@ function toggleVisibility(linkObj)
3815
summary.hide();
3916
$(linkObj).removeClass('closed').addClass('opened');
4017
$(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
41-
}
18+
}
4219
return false;
4320
}
4421

@@ -60,7 +37,7 @@ function toggleLevel(level)
6037
$(this).show();
6138
} else if (l==level+1) {
6239
i.removeClass('iconfclosed iconfopen').addClass('iconfclosed');
63-
a.html('▶');
40+
a.html('►');
6441
$(this).show();
6542
} else {
6643
$(this).hide();
@@ -87,7 +64,7 @@ function toggleFolder(id)
8764
// replace down arrow by right arrow for current row
8865
var currentRowSpans = currentRow.find("span");
8966
currentRowSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
90-
currentRowSpans.filter(".arrow").html('▶');
67+
currentRowSpans.filter(".arrow").html('►');
9168
rows.filter("[id^=row_"+id+"]").hide(); // hide all children
9269
} else { // we are SHOWING
9370
// replace right arrow by down arrow for current row
@@ -97,7 +74,7 @@ function toggleFolder(id)
9774
// replace down arrows by right arrows for child rows
9875
var childRowsSpans = childRows.find("span");
9976
childRowsSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
100-
childRowsSpans.filter(".arrow").html('▶');
77+
childRowsSpans.filter(".arrow").html('►');
10178
childRows.show(); //show all children
10279
}
10380
updateStripes();
@@ -117,7 +94,7 @@ function toggleInherit(id)
11794
$(img).attr('src',src.substring(0,src.length-10)+'open.png');
11895
}
11996
}
120-
/* @license-end */
97+
12198

12299
$(document).ready(function() {
123100
$('.code,.codeRef').each(function() {

‎docs/android/doc/html/jquery.js

Lines changed: 2 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/android/doc/html/menu.js

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
/*
2-
@licstart The following is the entire license notice for the
3-
JavaScript code in this file.
4-
5-
Copyright (C) 1997-2017 by Dimitri van Heesch
6-
7-
This program is free software; you can redistribute it and/or modify
8-
it under the terms of the GNU General Public License as published by
9-
the Free Software Foundation; either version 2 of the License, or
10-
(at your option) any later version.
11-
12-
This program is distributed in the hope that it will be useful,
13-
but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
GNU General Public License for more details.
16-
17-
You should have received a copy of the GNU General Public License along
18-
with this program; if not, write to the Free Software Foundation, Inc.,
19-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20-
21-
@licend The above is the entire license notice
22-
for the JavaScript code in this file
23-
*/
241
function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
252
function makeTree(data,relPath) {
263
var result='';
@@ -47,4 +24,3 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
4724
}
4825
$('#main-menu').smartmenus();
4926
}
50-
/* @license-end */

‎docs/android/doc/html/menudata.js

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
/*
2-
@ @licstart The following is the entire license notice for the
3-
JavaScript code in this file.
4-
5-
Copyright (C) 1997-2017 by Dimitri van Heesch
6-
7-
This program is free software; you can redistribute it and/or modify
8-
it under the terms of the GNU General Public License as published by
9-
the Free Software Foundation; either version 2 of the License, or
10-
(at your option) any later version.
11-
12-
This program is distributed in the hope that it will be useful,
13-
but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
GNU General Public License for more details.
16-
17-
You should have received a copy of the GNU General Public License along
18-
with this program; if not, write to the Free Software Foundation, Inc.,
19-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20-
21-
@licend The above is the entire license notice
22-
for the JavaScript code in this file
23-
*/
241
var menudata={children:[
252
{text:"Main Page",url:"index.html"},
263
{text:"Data Structures",url:"annotated.html",children:[

‎docs/android/doc/html/search/all_0.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_0.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

‎docs/android/doc/html/search/all_1.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_1.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

‎docs/android/doc/html/search/all_2.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_2.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

‎docs/android/doc/html/search/all_3.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_3.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

‎docs/android/doc/html/search/all_4.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_4.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

‎docs/android/doc/html/search/all_5.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_5.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

‎docs/android/doc/html/search/all_6.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_6.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

‎docs/android/doc/html/search/all_7.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<html><head><title></title>
33
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
4-
<meta name="generator" content="Doxygen 1.8.14"/>
4+
<meta name="generator" content="Doxygen 1.8.13"/>
55
<link rel="stylesheet" type="text/css" href="search.css"/>
66
<script type="text/javascript" src="all_7.js"></script>
77
<script type="text/javascript" src="search.js"></script>
@@ -11,19 +11,15 @@
1111
<div class="SRStatus" id="Loading">Loading...</div>
1212
<div id="SRResults"></div>
1313
<script type="text/javascript"><!--
14-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
1514
createResults();
16-
/* @license-end */
1715
--></script>
1816
<div class="SRStatus" id="Searching">Searching...</div>
1917
<div class="SRStatus" id="NoMatches">No Matches</div>
2018
<script type="text/javascript"><!--
21-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
2219
document.getElementById("Loading").style.display="none";
2320
document.getElementById("NoMatches").style.display="none";
2421
var searchResults = new SearchResults("searchResults");
2522
searchResults.Search();
26-
/* @license-end */
2723
--></script>
2824
</div>
2925
</body>

0 commit comments

Comments
 (0)