| Index: media/base/video_frame_impl.h
|
| ===================================================================
|
| --- media/base/video_frame_impl.h (revision 23335)
|
| +++ media/base/video_frame_impl.h (working copy)
|
| @@ -26,6 +26,11 @@
|
| // timestamp and duration are all 0.
|
| static void CreateEmptyFrame(scoped_refptr<VideoFrame>* frame_out);
|
|
|
| + // Allocates YV12 frame based on |width| and |height|, and sets its data to
|
| + // the YUV equivalent of RGB(0,0,0).
|
| + static void CreateBlackFrame(int width, int height,
|
| + scoped_refptr<VideoFrame>* frame_out);
|
| +
|
| // Implementation of VideoFrame.
|
| virtual bool Lock(VideoSurface* surface);
|
| virtual void Unlock();
|
|
|
| Property changes on: media\base\video_frame_impl.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/media/base/video_frame_impl.h:r69-2775
|
| Merged /trunk/src/media/base/video_frame_impl.h:r23255
|
|
|
|
|