Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index 5bde8ba8cedd502b2668b7fe50b4b85917b9565b..86eb093423d522daee568b284b9bb4c1bc783760 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -3002,7 +3002,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
| #if defined(ENABLE_WEBRTC) |
| EnsureMediaStreamClient(); |
|
scherkus (not reviewing)
2013/08/23 22:21:40
I know you want to merge this so we should keep it
|
| #if !defined(GOOGLE_TV) |
| - if (media_stream_client_->IsMediaStream(url)) { |
| + if (media_stream_client_ && media_stream_client_->IsMediaStream(url)) { |
| #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
| bool found_neon = |
| (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; |