X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia%2Fvideo%2Fcapture%2Flinux%2Fvideo_capture_device_linux.h;h=c6d151832650307768acb275f3ba0f9cbcfd7e37;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=5415eb744d996f06159862a6ef04bc6093eb53f0;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/media/video/capture/linux/video_capture_device_linux.h b/src/media/video/capture/linux/video_capture_device_linux.h index 5415eb7..c6d1518 100644 --- a/src/media/video/capture/linux/video_capture_device_linux.h +++ b/src/media/video/capture/linux/video_capture_device_linux.h @@ -12,7 +12,7 @@ #include -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/threading/thread.h" #include "media/video/capture/video_capture_device.h" @@ -59,7 +59,7 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice { // Called on the v4l2_thread_. void OnAllocateAndStart(int width, int height, - int frame_rate, + float frame_rate, scoped_ptr client); void OnStopAndDeAllocate(); void OnCaptureTask();