diff --git a/talk/media/webrtc/webrtctexturevideoframe.h b/talk/media/webrtc/webrtctexturevideoframe.h deleted file mode 100644 index ebdfd53f2e..0000000000 --- a/talk/media/webrtc/webrtctexturevideoframe.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * libjingle - * Copyright 2013 Google Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef TALK_MEDIA_WEBRTC_WEBRTCTEXTUREVIDEOFRAME_H_ -#define TALK_MEDIA_WEBRTC_WEBRTCTEXTUREVIDEOFRAME_H_ - -#include "talk/media/webrtc/webrtcvideoframe.h" - -// TODO(magjed): Remove this when all external dependencies are updated. -namespace cricket { - -typedef WebRtcVideoFrame WebRtcTextureVideoFrame; - -} // namespace cricket - -#endif // TALK_MEDIA_WEBRTC_WEBRTCTEXTUREVIDEOFRAME_H_ diff --git a/webrtc/common_video/interface/texture_video_frame.h b/webrtc/common_video/interface/texture_video_frame.h deleted file mode 100644 index c41dcfbd89..0000000000 --- a/webrtc/common_video/interface/texture_video_frame.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef COMMON_VIDEO_INTERFACE_TEXTURE_VIDEO_FRAME_H -#define COMMON_VIDEO_INTERFACE_TEXTURE_VIDEO_FRAME_H - -#include "webrtc/common_video/interface/i420_video_frame.h" - -// TODO(magjed): Remove this when all external dependencies are updated. -namespace webrtc { - -typedef I420VideoFrame TextureVideoFrame; - -} // namespace webrtc - -#endif // COMMON_VIDEO_INTERFACE_TEXTURE_VIDEO_FRAME_H