Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix Compiler Warnings (xvba, vdpau, dvdplayer) #113

Merged
merged 3 commits into from

2 participants

@fritsch

XVBA, VDPAU compiler warnings
dvdplayer, initialize membervar

@FernetMenta FernetMenta referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@FernetMenta FernetMenta merged commit b1d308f into FernetMenta:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
19 xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -232,7 +232,7 @@ long CDecoder::Release()
}
}
}
- IHardwareDecoder::Release();
+ return IHardwareDecoder::Release();
}
long CDecoder::ReleasePicReference()
@@ -1406,8 +1406,8 @@ void CMixer::StateMachine(int signal, Protocol *port, Message *msg)
void CMixer::Process()
{
- Message *msg;
- Protocol *port;
+ Message *msg = NULL;
+ Protocol *port = NULL;
bool gotMsg;
m_state = M_TOP_UNCONFIGURED;
@@ -1512,7 +1512,6 @@ void CMixer::CreateVdpauMixer()
void CMixer::InitCSCMatrix(int Width)
{
- VdpStatus vdp_st;
m_Procamp.struct_version = VDP_PROCAMP_VERSION;
m_Procamp.brightness = 0.0;
m_Procamp.contrast = 1.0;
@@ -2646,8 +2645,8 @@ void COutput::StateMachine(int signal, Protocol *port, Message *msg)
void COutput::Process()
{
- Message *msg;
- Protocol *port;
+ Message *msg = NULL;
+ Protocol *port = NULL;
bool gotMsg;
m_state = O_TOP_UNCONFIGURED;
@@ -2861,7 +2860,6 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture()
pixmap->DVDPic = pic.DVDPic;
pixmap->id = i;
m_bufferPool.notVisiblePixmaps.push_back(pixmap);
- VdpStatus vdp_st;
m_config.vdpProcs.vdp_presentation_queue_display(pixmap->vdp_flip_queue,
pixmap->surface,0,0,0);
}
@@ -3019,7 +3017,7 @@ bool COutput::EnsureBufferPool()
{
// create pixmpas
VdpauBufferPool::Pixmaps pixmap;
- int numPixmaps = NUM_RENDER_PICS;
+ unsigned int numPixmaps = NUM_RENDER_PICS;
for (unsigned int i = 0; i < numPixmaps; i++)
{
pixmap.pixmap = None;
@@ -3324,7 +3322,7 @@ void COutput::GLMapSurfaces()
if (m_config.videoSurfaces->size() != m_bufferPool.glVideoSurfaceMap.size())
{
CSingleLock lock(*m_config.videoSurfaceSec);
- for (int i = 0; i < m_config.videoSurfaces->size(); i++)
+ for (unsigned int i = 0; i < m_config.videoSurfaces->size(); i++)
{
if ((*m_config.videoSurfaces)[i]->surface == VDP_INVALID_HANDLE)
continue;
@@ -3372,7 +3370,7 @@ void COutput::GLMapSurfaces()
if (m_bufferPool.glOutputSurfaceMap.size() != m_bufferPool.numOutputSurfaces)
{
VdpauBufferPool::GLVideoSurface glSurface;
- for (int i=m_bufferPool.glOutputSurfaceMap.size(); i<m_bufferPool.outputSurfaces.size(); i++)
+ for (unsigned int i = m_bufferPool.glOutputSurfaceMap.size(); i<m_bufferPool.outputSurfaces.size(); i++)
{
glSurface.sourceRgb = m_bufferPool.outputSurfaces[i];
glGenTextures(1, glSurface.texture);
@@ -3496,7 +3494,6 @@ bool COutput::CheckStatus(VdpStatus vdp_st, int line)
bool COutput::CreateGlxContext()
{
GLXContext glContext;
- Window window;
m_Display = g_Windowing.GetDisplay();
glContext = g_Windowing.GetGlxContext();
View
4 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp
@@ -1809,8 +1809,8 @@ void COutput::StateMachine(int signal, Protocol *port, Message *msg)
void COutput::Process()
{
- Message *msg;
- Protocol *port;
+ Message *msg = NULL;
+ Protocol *port = NULL;
bool gotMsg;
m_state = O_TOP_UNCONFIGURED;
View
2  xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -1128,7 +1128,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
}
CStdString formatstr;
- bool buffering;
+ bool buffering = false;
switch(pPicture->format)
{
Something went wrong with that request. Please try again.