diff options
| author | Ilia Mirkin <[email protected]> | 2013-08-24 00:50:52 -0400 |
|---|---|---|
| committer | Christian König <[email protected]> | 2013-08-25 10:14:30 +0200 |
| commit | 293fa4e5592896ff5f4992818e0c24a645369253 (patch) | |
| tree | 38987218fad6d7f9e249c3d333a6b72379fdfac5 /src/gallium/drivers/nv50 | |
| parent | 56ea2c4816dbcdbdabe7718423828fdb2ee1c95b (diff) | |
nouveau/video: avoid overwriting base codec init with template
Commit 53e20b8b introduced the use of a template to initialize some
common fields. Move this copying of fields to before the common vp3
fields are initialized.
Reported-by: Martin Peres <[email protected]>
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nv50')
| -rw-r--r-- | src/gallium/drivers/nv50/nv98_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv98_video.c b/src/gallium/drivers/nv50/nv98_video.c index 0fa3a626d9c..8a1304402db 100644 --- a/src/gallium/drivers/nv50/nv98_video.c +++ b/src/gallium/drivers/nv50/nv98_video.c @@ -86,6 +86,7 @@ nv98_create_decoder(struct pipe_context *context, if (!dec) return NULL; dec->client = screen->client; + dec->base = *templ; nouveau_vp3_decoder_init_common(&dec->base); dec->bsp_idx = 5; @@ -136,7 +137,6 @@ nv98_create_decoder(struct pipe_context *context, for (i = 0; i < 5; i++) PUSH_DATA (push[2], nv04_data.vram); - dec->base = *templ; dec->base.context = context; dec->base.decode_bitstream = nv98_decoder_decode_bitstream; |