| Index: content/renderer/pepper/pepper_video_decoder_host.cc
|
| diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc
|
| index 2033195adb9ef8303bb850e0c24ee698a871a550..f15cd5857ab829283a870bc4a3642e40fd943fe2 100644
|
| --- a/content/renderer/pepper/pepper_video_decoder_host.cc
|
| +++ b/content/renderer/pepper/pepper_video_decoder_host.cc
|
| @@ -139,6 +139,9 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize(
|
| }
|
| decoder_.reset();
|
|
|
| +#if defined(OS_ANDROID)
|
| + return PP_ERROR_NOTSUPPORTED;
|
| +#else
|
| if (!allow_software_fallback)
|
| return PP_ERROR_NOTSUPPORTED;
|
|
|
| @@ -147,6 +150,7 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize(
|
| decoder_->Initialize(media_profile, this);
|
|
|
| return PP_OK_COMPLETIONPENDING;
|
| +#endif
|
| }
|
|
|
| int32_t PepperVideoDecoderHost::OnHostMsgGetShm(
|
|
|