| Index: content/common/gpu/media/vaapi_video_decode_accelerator.cc
|
| diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.cc b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
|
| index df1f6443421d197b67aa31ef61634307175a242d..f9bd31a5a1f0828832b542d25c7df29989c1c8ba 100644
|
| --- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc
|
| +++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
|
| @@ -210,7 +210,7 @@ bool VaapiVideoDecodeAccelerator::TFPPicture::Bind() {
|
| return false;
|
|
|
| gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, texture_id_);
|
| - glXBindTexImageEXT(x_display_, glx_pixmap_, GLX_FRONT_LEFT_EXT, NULL);
|
| + glXBindTexImageEXT(x_display_, glx_pixmap_, GLX_FRONT_LEFT_EXT, nullptr);
|
|
|
| return true;
|
| }
|
| @@ -220,7 +220,7 @@ VaapiVideoDecodeAccelerator::TFPPicture*
|
| TFPPictures::iterator it = tfp_pictures_.find(picture_buffer_id);
|
| if (it == tfp_pictures_.end()) {
|
| LOG(ERROR) << "Picture id " << picture_buffer_id << " does not exist";
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| return it->second.get();
|
|
|