| Index: content/common/gpu/media/vaapi_h264_decoder.cc
|
| diff --git a/content/common/gpu/media/vaapi_h264_decoder.cc b/content/common/gpu/media/vaapi_h264_decoder.cc
|
| index 3b53dae43392d9072e8872b481e602b164f7c762..36c7ff31d38f9ce3bd3bd1f4a3bfa7be40f22d40 100644
|
| --- a/content/common/gpu/media/vaapi_h264_decoder.cc
|
| +++ b/content/common/gpu/media/vaapi_h264_decoder.cc
|
| @@ -479,7 +479,7 @@ bool VaapiH264Decoder::InitializeFBConfig() {
|
| scoped_ptr_malloc<GLXFBConfig, ScopedPtrXFree> glx_fb_configs(
|
| glXChooseFBConfig(x_display_, DefaultScreen(x_display_), fbconfig_attr,
|
| &num_fbconfigs));
|
| - if (!glx_fb_configs.get())
|
| + if (!glx_fb_configs)
|
| return false;
|
| if (!num_fbconfigs)
|
| return false;
|
| @@ -2018,7 +2018,7 @@ bool VaapiH264Decoder::FinishPicture() {
|
| if (!(*output_candidate)->ref) {
|
| // Current picture hasn't been inserted into DPB yet, so don't remove it
|
| // if we managed to output it immediately.
|
| - if (*output_candidate != pic.get())
|
| + if (*output_candidate != pic)
|
| dpb_.RemoveByPOC((*output_candidate)->pic_order_cnt);
|
| // Mark as unused.
|
| UnassignSurfaceFromPoC((*output_candidate)->pic_order_cnt);
|
|
|