From 9f7f7e155cd0d88cb5a24143f3e59dd4bd57a4b5 Mon Sep 17 00:00:00 2001 From: Gary Buhrmaster Date: Wed, 11 Sep 2013 23:16:33 +0000 Subject: [PATCH] Explicit casts for C++11 standards compliance --- mythtv/libs/libmythtv/videoout_nullvdpau.cpp | 6 +++--- mythtv/libs/libmythtv/videoout_vdpau.cpp | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mythtv/libs/libmythtv/videoout_nullvdpau.cpp b/mythtv/libs/libmythtv/videoout_nullvdpau.cpp index f2d010701b9..3f23cefc5fb 100644 --- a/mythtv/libs/libmythtv/videoout_nullvdpau.cpp +++ b/mythtv/libs/libmythtv/videoout_nullvdpau.cpp @@ -491,9 +491,9 @@ void VideoOutputNullVDPAU::ReleaseFrame(VideoFrame *frame) { VideoFrame *vf = m_shadowBuffers->At(i); uint32_t pitches[] = { - vf->pitches[0], - vf->pitches[2], - vf->pitches[1] }; + (uint32_t)vf->pitches[0], + (uint32_t)vf->pitches[2], + (uint32_t)vf->pitches[1] }; void* const planes[] = { vf->buf, vf->buf + vf->offsets[2], diff --git a/mythtv/libs/libmythtv/videoout_vdpau.cpp b/mythtv/libs/libmythtv/videoout_vdpau.cpp index eb160f81e9f..17f1282e84f 100644 --- a/mythtv/libs/libmythtv/videoout_vdpau.cpp +++ b/mythtv/libs/libmythtv/videoout_vdpau.cpp @@ -463,9 +463,9 @@ void VideoOutputVDPAU::PrepareFrame(VideoFrame *frame, FrameScanType scan, NUM_REFERENCE_FRAMES]; uint32_t pitches[3] = { - frame->pitches[0], - frame->pitches[2], - frame->pitches[1] + (uint32_t)frame->pitches[0], + (uint32_t)frame->pitches[2], + (uint32_t)frame->pitches[1] }; void* const planes[3] = { frame->buf, @@ -842,9 +842,9 @@ void VideoOutputVDPAU::UpdatePauseFrame(int64_t &disp_timecode) if (codec_is_std(video_codec_id)) { m_pause_surface = m_video_surfaces[0]; - uint32_t pitches[3] = { frame->pitches[0], - frame->pitches[2], - frame->pitches[1] }; + uint32_t pitches[3] = { (uint32_t)frame->pitches[0], + (uint32_t)frame->pitches[2], + (uint32_t)frame->pitches[1] }; void* const planes[3] = { frame->buf, frame->buf + frame->offsets[2], frame->buf + frame->offsets[1] }; @@ -1142,9 +1142,9 @@ void VideoOutputVDPAU::ShowPIP(VideoFrame *frame, MythPlayer *pipplayer, kVDPBlendNull); uint32_t pitches[] = { - pipimage->pitches[0], - pipimage->pitches[2], - pipimage->pitches[1] }; + (uint32_t)pipimage->pitches[0], + (uint32_t)pipimage->pitches[2], + (uint32_t)pipimage->pitches[1] }; void* const planes[] = { pipimage->buf, pipimage->buf + pipimage->offsets[2],