diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-09-13 20:37:30 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-09-13 20:37:30 +0200 |
| commit | 1ebb209bc6b6e8bd28a9aca1811aed605b015ded (patch) | |
| tree | 914a3e6d8efd13d9fe95012d55ff7b495d4b8565 /assets | |
| parent | 4b1b271ca91600d4293a56ea7e0d3682afa88d71 (diff) | |
| download | AntennaPod-1ebb209bc6b6e8bd28a9aca1811aed605b015ded.zip | |
Added support for reading MP4 chapters
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/LICENSE_FFMPEGMEDIAMETADATARETRIEVER.txt | 16 | ||||
| -rw-r--r-- | assets/about.html | 8 |
2 files changed, 24 insertions, 0 deletions
diff --git a/assets/LICENSE_FFMPEGMEDIAMETADATARETRIEVER.txt b/assets/LICENSE_FFMPEGMEDIAMETADATARETRIEVER.txt new file mode 100644 index 000000000..fcaf80557 --- /dev/null +++ b/assets/LICENSE_FFMPEGMEDIAMETADATARETRIEVER.txt @@ -0,0 +1,16 @@ +FFmpegMediaMetadataRetriever: A unified interface for retrieving frame +and meta data from an input media file. + +Copyright 2014 William Seemann + +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. diff --git a/assets/about.html b/assets/about.html index 8b8746add..baf6208e3 100644 --- a/assets/about.html +++ b/assets/about.html @@ -79,4 +79,12 @@ licensed under the Apache 2.0 license <a href="LICENSE_OKHTTP.txt">(View)</a> <h2>Okio <a href="https://github.com/square/okio">(Link)</a></h2> licensed under the Apache 2.0 license <a href="LICENSE_OKIO.txt">(View)</a> + +<h2>FFmpegMediaMetadataRetriever <a href="https://github.com/wseemann/FFmpegMediaMetadataRetriever">(Link)</a></h2> +licensed under the Apache 2.0 license <a href="LICENSE_FFMPEGMEDIAMETADATARETRIEVER.txt">(View)</a> + +<p>This software uses <a href="https://ffmpeg.org">FFmpeg</a> licensed under the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"> + LGPLv2.1</a> and its source can be downloaded <a href="https://github.com/wseemann/FFmpegMediaMetadataRetriever/blob/master/fmmr-library/ffmpeg-2.1-android-2013-11-13.tar.gz">here</a>.</p> +</a> + </html> |