commit fc2b2960d06de38985ca51023fda03b130aae6bb
Author: bbudge <
bbu...@chromium.org>
AuthorDate: Thu Feb 05 22:10:54 2015
Commit: Commit bot <
commi...@chromium.org>
CommitDate: Thu Feb 05 22:11:49 2015
Pepper: PPB_VideoEncoder should be 'Dev' only for now.
Also changes copyright notices to the new style.
BUG=455409
Review URL:
https://codereview.chromium.org/885803003
Cr-Commit-Position: refs/heads/master@{#314893}
diff --git a/ppapi/api/ppb_video_encoder.idl b/ppapi/api/ppb_video_encoder.idl
index 8e02707..1796f91 100644
--- a/ppapi/api/ppb_video_encoder.idl
+++ b/ppapi/api/ppb_video_encoder.idl
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015 The Chromium Authors. All rights reserved.
+/* Copyright 2015 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -10,7 +10,7 @@
[generate_thunk]
label Chrome {
- M42 = 0.1
+ [channel=dev] M42 = 0.1
};
/**
diff --git a/ppapi/c/ppb_video_encoder.h b/ppapi/c/ppb_video_encoder.h
index 94a33e8..744c3d3 100644
--- a/ppapi/c/ppb_video_encoder.h
+++ b/ppapi/c/ppb_video_encoder.h
@@ -1,9 +1,9 @@
-/* Copyright (c) 2015 The Chromium Authors. All rights reserved.
+/* Copyright 2015 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-/* From ppb_video_encoder.idl modified Wed Feb 4 05:24:29 2015. */
+/* From ppb_video_encoder.idl modified Thu Feb 5 10:33:32 2015. */
#ifndef PPAPI_C_PPB_VIDEO_ENCODER_H_
#define PPAPI_C_PPB_VIDEO_ENCODER_H_
@@ -19,9 +19,7 @@
#include "ppapi/c/pp_stdint.h"
#include "ppapi/c/ppb_video_frame.h"
-#define PPB_VIDEOENCODER_INTERFACE_0_1 "PPB_VideoEncoder;0.1"
-#define PPB_VIDEOENCODER_INTERFACE PPB_VIDEOENCODER_INTERFACE_0_1
-
+#define PPB_VIDEOENCODER_INTERFACE_0_1 "PPB_VideoEncoder;0.1" /* dev */
/**
* @file
* This file defines the <code>PPB_VideoEncoder</code> interface.
@@ -56,7 +54,7 @@
* Chrome and ChromeOS: h264.
* ChromeOS: mpeg4.
*/
-struct PPB_VideoEncoder_0_1 {
+struct PPB_VideoEncoder_0_1 { /* dev */
/**
* Creates a new video encoder resource.
*
@@ -237,8 +235,6 @@
*/
void (*Close)(PP_Resource video_encoder);
};
-
-typedef struct PPB_VideoEncoder_0_1 PPB_VideoEncoder;
/**
* @}
*/
diff --git a/ppapi/cpp/video_encoder.cc b/ppapi/cpp/video_encoder.cc
index ae589aa..49c7de8 100644
--- a/ppapi/cpp/video_encoder.cc
+++ b/ppapi/cpp/video_encoder.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/ppapi/cpp/video_encoder.h b/ppapi/cpp/video_encoder.h
index a548ab5..d022e3e 100644
--- a/ppapi/cpp/video_encoder.h
+++ b/ppapi/cpp/video_encoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/ppapi/thunk/ppb_video_encoder_thunk.cc b/ppapi/thunk/ppb_video_encoder_thunk.cc
index 5b2aeba..b6981e5 100644
--- a/ppapi/thunk/ppb_video_encoder_thunk.cc
+++ b/ppapi/thunk/ppb_video_encoder_thunk.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// From ppb_video_encoder.idl modified Wed Feb 4 05:19:27 2015.
+// From ppb_video_encoder.idl modified Thu Feb 5 10:33:32 2015.
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"