diff options
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/vdpau/decode.c | 8 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xvmc/surface.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index c0af83b..e254c50 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -495,18 +495,18 @@ vlVdpDecoderRender(VdpDecoder decoder, memset(&desc, 0, sizeof(desc)); desc.base.profile = dec->profile; switch (u_reduce_video_profile(dec->profile)) { - case PIPE_VIDEO_CODEC_MPEG12: + case PIPE_VIDEO_FORMAT_MPEG12: ret = vlVdpDecoderRenderMpeg12(&desc.mpeg12, (VdpPictureInfoMPEG1Or2 *)picture_info); break; - case PIPE_VIDEO_CODEC_MPEG4: + case PIPE_VIDEO_FORMAT_MPEG4: ret = vlVdpDecoderRenderMpeg4(&desc.mpeg4, (VdpPictureInfoMPEG4Part2 *)picture_info); break; - case PIPE_VIDEO_CODEC_VC1: + case PIPE_VIDEO_FORMAT_VC1: if (dec->profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED) vlVdpDecoderFixVC1Startcode(&bitstream_buffer_count, buffers, sizes); ret = vlVdpDecoderRenderVC1(&desc.vc1, (VdpPictureInfoVC1 *)picture_info); break; - case PIPE_VIDEO_CODEC_MPEG4_AVC: + case PIPE_VIDEO_FORMAT_MPEG4_AVC: ret = vlVdpDecoderRenderH264(&desc.h264, (VdpPictureInfoH264 *)picture_info); break; default: diff --git a/src/gallium/state_trackers/xvmc/surface.c b/src/gallium/state_trackers/xvmc/surface.c index 6a895aa..de90e54 100644 --- a/src/gallium/state_trackers/xvmc/surface.c +++ b/src/gallium/state_trackers/xvmc/surface.c @@ -57,7 +57,7 @@ MacroBlocksToPipe(XvMCContextPrivate *context, assert(num_macroblocks); for (; num_macroblocks > 0; --num_macroblocks) { - mb->base.codec = PIPE_VIDEO_CODEC_MPEG12; + mb->base.codec = PIPE_VIDEO_FORMAT_MPEG12; mb->x = xvmc_mb->x; mb->y = xvmc_mb->y; mb->macroblock_type = xvmc_mb->macroblock_type; |