diff options
| author | Emeric Grange <emeric.grange@gmail.com> | 2011-11-13 19:01:58 +0100 |
|---|---|---|
| committer | Emeric Grange <emeric.grange@gmail.com> | 2012-06-24 16:57:31 +0200 |
| commit | c40862064df7c2e4021b7b234c100655ca39ebfc (patch) | |
| tree | 8e19f21b5db9331765c4195117b52527f1e64e9a | |
| parent | caf67398a985be7356861b709eea1b3f8d5d2da4 (diff) | |
st/vdpau: Fix bad merge with last master modifications on the vdpau state tracker
Signed-off-by: Emeric Grange <emeric.grange@gmail.com>
| -rw-r--r-- | src/gallium/state_trackers/vdpau/decode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index 3d2edae237..8ae489ef06 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -412,12 +412,10 @@ vlVdpDecoderFixVC1Startcode(uint32_t *num_buffers, const void *buffers[], unsign static VdpStatus vlVdpDecoderRenderVP8(struct pipe_video_decoder *decoder, - VdpPictureInfoVP8 *picture_info, - uint32_t bitstream_buffer_count, - VdpBitstreamBuffer const *bitstream_buffers) + VdpPictureInfoVP8 *picture_info) { struct pipe_vp8_picture_desc picture; - struct pipe_video_buffer *ref_frames[3]; + struct pipe_video_buffer *ref_frames[3] = {}; unsigned i = 0, j, k, l; VDPAU_MSG(VDPAU_TRACE, "[VDPAU] Decoding VP8\n"); |