Mesa (10.2): nouveau: remove unneeded assert
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Sep 17 02:31:27 UTC 2014
Module: Mesa
Branch: 10.2
Commit: e1c04225c1164f1d3fe68d8015fb85f0061b0978
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1c04225c1164f1d3fe68d8015fb85f0061b0978
Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date: Wed Sep 10 17:06:34 2014 +0200
nouveau: remove unneeded assert
No idea why it was added, but the code runs fine even on videos
where it triggers.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Cc: "10.2 10.3" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 8ab85bfcd5ddd44c50e5b384222731cb2a1a1496)
---
src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c b/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c
index edbc82b..25283b7 100644
--- a/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c
+++ b/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c
@@ -271,7 +271,6 @@ nouveau_vp3_fill_picparm_mpeg4_vp(struct nouveau_vp3_decoder *dec,
{
struct mpeg4_picparm_vp pic_vp_stub = {}, *pic_vp = &pic_vp_stub;
uint32_t ring, ret = 0x01014; // !async_shutdown << 16 | watchdog << 12 | irq_record << 4 | unk;
- assert(!(dec->base.width & 0xf));
*is_ref = desc->vop_coding_type <= 1;
pic_vp->width = dec->base.width;
More information about the mesa-commit
mailing list