diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:55:44 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:55:44 +0200 |
| commit | f23a7f9da4958527a7fe762f82fa7fc28e8f0adf (patch) | |
| tree | 96191ab23df7c92cee585f4fa0938b82d74b2fac /src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm | |
| parent | a13b4dbb32bf3c022cae7f1e9e3c792a8140543b (diff) | |
| parent | bf26ab71e0713bbcaa967402992630411086769c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm')
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm index 54c65fdd4..9a1808491 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm @@ -447,7 +447,7 @@ void AVFMediaPlayerSession::setVideoOutput(AVFVideoOutput *output) if (m_videoOutput == output) return; - //Set the current ouput layer to null to stop rendering + //Set the current output layer to null to stop rendering if (m_videoOutput) { m_videoOutput->setLayer(0); } |