Skip to content

Instantly share code, notes, and snippets.

@tiagovignatti
Created October 29, 2014 18:14
Show Gist options
  • Save tiagovignatti/e160a332ea829b63ddb5 to your computer and use it in GitHub Desktop.
Save tiagovignatti/e160a332ea829b63ddb5 to your computer and use it in GitHub Desktop.
diff --git a/content/common/gpu/media/vaapi_picture_provider_drm.cc b/content/common/gpu/media/vaapi_picture_provider_drm.cc
index 5a8d0fa..4be8c57 100644
--- a/content/common/gpu/media/vaapi_picture_provider_drm.cc
+++ b/content/common/gpu/media/vaapi_picture_provider_drm.cc
@@ -62,7 +62,7 @@ DrmPicture::~DrmPicture() {
gl_image_->Destroy(true);
- DCHECK_EQ(glGetError(), GL_NO_ERROR);
+ DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
}
}
diff --git a/content/common/gpu/media/vaapi_wrapper.h b/content/common/gpu/media/vaapi_wrapper.h
index 658ccd5..17de36d 100644
--- a/content/common/gpu/media/vaapi_wrapper.h
+++ b/content/common/gpu/media/vaapi_wrapper.h
@@ -46,8 +46,6 @@ class CONTENT_EXPORT VaapiWrapper : public base::RefCounted<VaapiWrapper> {
kEncode,
};
- ~VaapiWrapper();
-
// |report_error_to_uma_cb| will be called independently from reporting
// errors to clients via method return values.
static scoped_refptr<VaapiWrapper> Create(
@@ -162,7 +160,10 @@ class CONTENT_EXPORT VaapiWrapper : public base::RefCounted<VaapiWrapper> {
#endif // USE_X11
private:
+ friend class base::RefCounted<VaapiWrapper>;
+
VaapiWrapper();
+ ~VaapiWrapper();
bool Initialize(CodecMode mode,
media::VideoCodecProfile profile,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment