| Index: media/video/capture/android/video_capture_device_android.h
|
| diff --git a/media/video/capture/android/video_capture_device_android.h b/media/video/capture/android/video_capture_device_android.h
|
| index 29a5fc7cf5dea14713ca5cd3c8dc7bba3f4dc43b..297a66dc0cdda64b815a4e38dcd51629d8cbf5df 100644
|
| --- a/media/video/capture/android/video_capture_device_android.h
|
| +++ b/media/video/capture/android/video_capture_device_android.h
|
| @@ -20,7 +20,7 @@ namespace media {
|
| // by VideoCaptureManager on its own thread, while OnFrameAvailable is called
|
| // on JAVA thread (i.e., UI thread). Both will access |state_| and |observer_|,
|
| // but only VideoCaptureManager would change their value.
|
| -class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
|
| +class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice1 {
|
| public:
|
| virtual ~VideoCaptureDeviceAndroid();
|
|
|
|
|