| Index: webrtc/video_decoder.h | 
| diff --git a/webrtc/video_decoder.h b/webrtc/video_decoder.h | 
| index 70c09129f788908de537b08aa4a68e4c7c42a703..fd487849cebbbd8d58bc51adb66054e99eb1c0a8 100644 | 
| --- a/webrtc/video_decoder.h | 
| +++ b/webrtc/video_decoder.h | 
| @@ -68,6 +68,13 @@ class VideoDecoder { | 
| const CodecSpecificInfo* codec_specific_info = NULL, | 
| int64_t render_time_ms = -1) = 0; | 
|  | 
| +#if defined(WEBRTC_ANDROID) | 
| +  // This is a temporary remedy while the Android capture implementation is | 
| +  // being changed to deliver frames on the decoder thread without polling. | 
| +  // See https://bugs.chromium.org/p/webrtc/issues/detail?id=7361 | 
| +  virtual void PollDecodedFrames() {} | 
| +#endif | 
| + | 
| virtual int32_t RegisterDecodeCompleteCallback( | 
| DecodedImageCallback* callback) = 0; | 
|  | 
|  |