diff options
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 8 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_video_decoder.h | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vdpau/decode.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index 5b214b83cf5..61d947ca4c8 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -380,10 +380,12 @@ vl_mpeg12_buffer_get_mv_stream(struct pipe_video_decode_buffer *buffer, int ref_ static void vl_mpeg12_buffer_decode_bitstream(struct pipe_video_decode_buffer *buffer, unsigned num_bytes, const void *data, - struct pipe_mpeg12_picture_desc *picture, + struct pipe_picture_desc *picture, unsigned num_ycbcr_blocks[3]) { struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer; + struct pipe_mpeg12_picture_desc *pic = (struct pipe_mpeg12_picture_desc *)picture; + struct vl_mpeg12_decoder *dec; unsigned i; @@ -393,9 +395,9 @@ vl_mpeg12_buffer_decode_bitstream(struct pipe_video_decode_buffer *buffer, assert(dec); for (i = 0; i < VL_MAX_PLANES; ++i) - vl_zscan_set_layout(&buf->zscan[i], picture->alternate_scan ? dec->zscan_alternate : dec->zscan_normal); + vl_zscan_set_layout(&buf->zscan[i], pic->alternate_scan ? dec->zscan_alternate : dec->zscan_normal); - vl_mpg12_bs_decode(&buf->bs, num_bytes, data, picture, num_ycbcr_blocks); + vl_mpg12_bs_decode(&buf->bs, num_bytes, data, pic, num_ycbcr_blocks); } static void diff --git a/src/gallium/include/pipe/p_video_decoder.h b/src/gallium/include/pipe/p_video_decoder.h index deda992a36c..f063d8f3a1b 100644 --- a/src/gallium/include/pipe/p_video_decoder.h +++ b/src/gallium/include/pipe/p_video_decoder.h @@ -121,7 +121,7 @@ struct pipe_video_decode_buffer */ void (*decode_bitstream)(struct pipe_video_decode_buffer *decbuf, unsigned num_bytes, const void *data, - struct pipe_mpeg12_picture_desc *picture, + struct pipe_picture_desc *picture, unsigned num_ycbcr_blocks[3]); /** diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index 0696278ac3e..269c7a4baf8 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -215,7 +215,7 @@ vlVdpDecoderRenderMpeg2(struct pipe_video_decoder *decoder, for (i = 0; i < bitstream_buffer_count; ++i) buffer->decode_bitstream(buffer, bitstream_buffers[i].bitstream_bytes, - bitstream_buffers[i].bitstream, &picture, num_ycbcr_blocks); + bitstream_buffers[i].bitstream, &picture.base, num_ycbcr_blocks); buffer->end_frame(buffer); |