diff options
| -rw-r--r-- | src/webengine/doc/src/external-resources.qdoc | 10 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 17 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc index 2987f1fca..38d8b637b 100644 --- a/src/webengine/doc/src/external-resources.qdoc +++ b/src/webengine/doc/src/external-resources.qdoc @@ -40,6 +40,16 @@ \title Chrome console API */ +/*! + \externalpage http://ffmpeg.org/ + \title FFmpeg +*/ + +/*! + \externalpage http://www.openh264.org/ + \title OpenH264 +*/ + /* This prevents autolinking of each occurrence of 'WebEngine' To link to the WebEngine QML type, use explicit linking: diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index cac364a7e..555db2a2d 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -99,4 +99,21 @@ \code --ppapi-flash-path=./libpepflashplayer.so \endcode + + \section1 Audio and Video Codec Support + + Qt WebEngine supports the MPEG-4 Part 14 (MP4) file format only if the required proprietary + audio and video codecs, such as H.264 and MPEG layer-3 (MP3), have been enabled. Proprietary + codecs can be enabled by passing the following option to qmake: + + \code + qmake WEBENGINE_CONFIG += use_proprietary_codecs + \endcode + + \warning When distributing proprietary codec libraries, you must acquire licenses for them. + + \l FFmpeg is a cross-platform solution to record, convert, and stream audio and video. It can + be configured for use with several codecs, which rises licensing issues during distribution + with the codec libraries. For some codecs, open source implementations, such as \l {OpenH264}, + are available. */ |