| Index: webrtc/media/base/yuvframegenerator.cc
|
| diff --git a/talk/media/base/yuvframegenerator.cc b/webrtc/media/base/yuvframegenerator.cc
|
| similarity index 99%
|
| rename from talk/media/base/yuvframegenerator.cc
|
| rename to webrtc/media/base/yuvframegenerator.cc
|
| index 2bec4e42315e4eb08d20642f2fdc6adbd1c117ee..548e97ddf0aed882243aef6e476c4be5d93b5d48 100644
|
| --- a/talk/media/base/yuvframegenerator.cc
|
| +++ b/webrtc/media/base/yuvframegenerator.cc
|
| @@ -1,6 +1,6 @@
|
| /*
|
| * libjingle
|
| - * Copyright 2004--2014 Google Inc.
|
| + * Copyright 2004 Google Inc.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are met:
|
| @@ -25,7 +25,7 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "talk/media/base/yuvframegenerator.h"
|
| +#include "webrtc/media/base/yuvframegenerator.h"
|
|
|
| #include <string.h>
|
| #include <sstream>
|
|
|