source/text/shared/00/00000404.xhp | 4 ++--
source/text/shared/01/moviesound.xhp | 29 ++++++++++++++++++++++++-----
2 files changed, 26 insertions(+), 7 deletions(-)
New commits:
commit 2efb8853f37090026c902720613ac9512132f393
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
Date: Mon Nov 20 18:47:48 2017 -0200
tdf#113949 Add more info on audio video support
After cloph's askbot answer.
Change-Id: I0dceef8b2ba500ca28a70231c04ecbfbaa0e925e
Reviewed-on: https://gerrit.libreoffice.org/45006
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/00/00000404.xhp
b/source/text/shared/00/00000404.xhp
index 227a88766..50f9d7538 100644
--- a/source/text/shared/00/00000404.xhp
+++ b/source/text/shared/00/00000404.xhp
@@ -68,8 +68,8 @@
</section>
</section>
<section id="mov_sound">
-<paragraph role="paragraph" id="par_idN107CD" xml-lang="en-US"><variable
id="moviesound">Choose <emph>Insert - Media - Audio or Video</emph>
-</variable></paragraph>
+ <paragraph role="paragraph" id="par_idN107CD" xml-lang="en-US"><variable
id="moviesound">Choose <emph>Insert - Media - Audio or
Video</emph>.</variable></paragraph>
+ <paragraph role="paragraph" id="par_idN107CE" xml-lang="en-US"><variable
id="moviesound2">Choose <emph>Insert - Audio or
Video</emph></variable></paragraph>
<section id="symoviesound">
<table id="">
<tablerow>
diff --git a/source/text/shared/01/moviesound.xhp
b/source/text/shared/01/moviesound.xhp
index cf0b723cb..32335c008 100644
--- a/source/text/shared/01/moviesound.xhp
+++ b/source/text/shared/01/moviesound.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textshared01moviesoundxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Audio or Video</title>
@@ -28,7 +28,8 @@
</meta>
<body>
<section id="moviesound">
-<bookmark xml-lang="en-US" branch="index"
id="bm_id1907712"><bookmark_value>inserting;movies/sounds</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id1907712">
+ <bookmark_value>inserting;movies/sounds</bookmark_value>
<bookmark_value>sound files</bookmark_value>
<bookmark_value>playing movies and sound files</bookmark_value>
<bookmark_value>videos</bookmark_value>
@@ -44,6 +45,7 @@
</section>
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#moviesound"/>
+ <embed href="text/shared/00/00000404.xhp#moviesound2"/>
</section>
<paragraph xml-lang="en-US" id="par_idN10683" role="heading"
level="2">To insert a movie or sound file into your document</paragraph>
<list type="ordered">
@@ -51,7 +53,7 @@
<paragraph xml-lang="en-US" id="par_idN1068A"
role="paragraph">Click where you want to insert the file.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN1068E"
role="paragraph">Choose <emph>Insert - Media - Audio or
Video</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1068E"
role="paragraph">Choose <emph>Insert - Media - Audio or Video</emph>. For
%PRODUCTNAME Impress, choose <emph>Insert - Audio or video</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN10696" role="paragraph">In
the File Open dialog, select the file that you want to insert.</paragraph>
@@ -78,8 +80,25 @@
</list>
<paragraph xml-lang="en-US" id="par_id0120200912062064" role="note">When
you show an Impress presentation, the embedded sound or video on the current
slide plays automatically until it's over or until you leave the
slide.</paragraph>
<paragraph xml-lang="en-US" id="par_idN106D0" role="paragraph">You can
also use the Media Playback Bar to pause, to stop, to loop, as well as to
adjust the volume or to mute the playback of the file. The current playback
position in the file is indicated on the left slider. Use the right slider to
adjust the playback volume. For movie files, the bar also contains a list box
where you can select the zoom factor for the playback.</paragraph>
+ <paragraph role="heading" id="hd_id281511208172156" level="2"
xml-lang="en-US">Supported media formats</paragraph>
+ <paragraph role="paragraph" id="par_id971511208248862"
xml-lang="en-US">%PRODUCTNAME relies on the operating system's installed media
support.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id231511209745892" role="listitem"
xml-lang="en-US"><emph>For Microsoft Windows</emph>: %PRODUCTNAME can open
anything for which <emph>DirectShow</emph> filters are installed (<link
href="http://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx";
name="linkname">list of default formats</link>).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id601511209768414" role="listitem"
xml-lang="en-US"><emph>For GNU/Linux</emph>: %PRODUCTNAME uses
<emph>gstreamer</emph>, so whatever you can play using gstreamer can be used
with %PRODUCTNAME (<link
href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/pwg/html/section-types-definitions.html";
name="linkname">list of defined types</link>).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id841511209784505" role="listitem"
xml-lang="en-US"><emph>For Apple macOS</emph>: %PRODUCTNAME uses
<emph>QuickTime</emph> supported media formats (<link
href="https://documentation.apple.com/en/finalcutpro/usermanual/index.html#chapter=103%26section=4%26tasks=true";
name="linkname">list of media formats</link>).</paragraph>
+ </listitem>
+ </list>
<section id="relatedtopics">
<embed href="text/shared/01/mediaplayer.xhp#mediaplayertitle"/>
+ <paragraph role="paragraph" id="par_id391511209364018"
xml-lang="en-US"><link
href="http://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx";
name="linkname">List of default formats for Microsoft Windows DirectShow
</link>.</paragraph>
+ <paragraph role="paragraph" id="par_id921511209448360"
xml-lang="en-US"><link
href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/pwg/html/section-types-definitions.html";
name="linkname">List of defined types for gstreamer in GNU/Linux
</link>.</paragraph>
+ <paragraph role="paragraph" id="par_id591511209548848"
xml-lang="en-US"><link
href="https://documentation.apple.com/en/finalcutpro/usermanual/index.html#chapter=103%26section=4%26tasks=true";
name="linkname">List of media formats for Apple macOS
QuickTime</link>.</paragraph>
+ <paragraph role="paragraph" id="par_id561511210645479"
xml-lang="en-US"><link
href="https://ask.libreoffice.org/en/question/854/what-video-formats-does-libreoffice-impress-support/";
name="linkname">%PRODUCTNAME Askbot question and answer</link></paragraph>
</section>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
