From: Christian König Date: Thu, 7 Jul 2016 09:22:32 +0000 (+0200) Subject: radeon/uvd: fix contex buffer destruction in the error path X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b474e06a210ab2045250035f5e135f7fb39eff2;p=mesa.git radeon/uvd: fix contex buffer destruction in the error path Destroying a not allocated buffer is harmless. Signed-off-by: Christian König Reviewed-by: Leo Liu --- diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c index 52658fa2393..275d8266c22 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.c +++ b/src/gallium/drivers/radeon/radeon_uvd.c @@ -937,10 +937,7 @@ static void ruvd_destroy(struct pipe_video_codec *decoder) } rvid_destroy_buffer(&dec->dpb); - if ((u_reduce_video_profile(dec->base.profile) == PIPE_VIDEO_FORMAT_HEVC) || - (dec->stream_type == RUVD_CODEC_H264_PERF && - ((struct r600_common_screen*)dec->screen)->family >= CHIP_POLARIS10)) - rvid_destroy_buffer(&dec->ctx); + rvid_destroy_buffer(&dec->ctx); FREE(dec); } @@ -1288,8 +1285,7 @@ error: } rvid_destroy_buffer(&dec->dpb); - if (dec->stream_type == RUVD_CODEC_H264_PERF && info.family >= CHIP_POLARIS10) - rvid_destroy_buffer(&dec->ctx); + rvid_destroy_buffer(&dec->ctx); FREE(dec);