Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move null check before anything references m_pFrame.

Fixes Coverity CID 1126047

Conflicts:
	xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
  • Loading branch information...
commit d0b89beabf70ff711bb82778381c42a396ebdd1b 1 parent 12c636e
cg110 cg110 authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
6 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
View
@@ -555,6 +555,9 @@ void CDVDVideoCodecFFmpeg::Reset()
bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture)
{
+ if (!m_pFrame)
+ return false;
+
pDvdVideoPicture->iWidth = m_pFrame->width;
pDvdVideoPicture->iHeight = m_pFrame->height;
@@ -592,9 +595,6 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture)
pDvdVideoPicture->pts = DVD_NOPTS_VALUE;
- if (!m_pFrame)
- return false;
-
AVDictionaryEntry * entry = av_dict_get(av_frame_get_metadata(m_pFrame), "stereo_mode", NULL, 0);
if(entry && entry->value)
{
Please sign in to comment.
Something went wrong with that request. Please try again.