[Merge] lp:~phablet-team/qtubuntu-media/fix-black-video-issues-take2 into lp:qtubuntu-media

[Alfonso Sanchez-Beato]

Just a small nit, see inline comment.

Diff comments:

> 
> === modified file 'src/aal/aalmediaplayerservice.cpp'
> --- src/aal/aalmediaplayerservice.cpp	2015-06-02 18:10:46 +0000
> +++ src/aal/aalmediaplayerservice.cpp	2015-06-18 20:33:38 +0000
> @@ -173,10 +173,11 @@
>  
>  std::shared_ptr<core::ubuntu::media::video::Sink> AalMediaPlayerService::createVideoSink(uint32_t texture_id)
>  {
> -    if (not m_hubPlayerSession) throw std::runtime_error
> -    {
> -        "Cannot create a video sink without a valid media-hub player session"
> -    };
> +    if (m_hubPlayerSession == NULL)

Please use nullptr instead.

> +        throw std::runtime_error
> +        {
> +            "Cannot create a video sink without a valid media-hub player session"
> +        };
>  
>      auto sink = m_hubPlayerSession->create_gl_texture_video_sink(texture_id);
>      m_videoOutputReady = true;


-- 
https://code.launchpad.net/~phablet-team/qtubuntu-media/fix-black-video-issues-take2/+merge/262128
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/qtubuntu-media/fix-black-video-issues-take2 into lp:qtubuntu-media.