xbmc: revert last FM patch

spotimc broken...
This commit is contained in:
Stefan Saraev 2014-03-18 23:46:01 +02:00
parent 0a4df2da0f
commit a8ff08ac2b

View File

@ -11146,45 +11146,3 @@ index c95f4ec..1208246 100644
--
1.8.5.5
From 05c9c779123f057adb6decc74b070e31d0b63478 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 17 Mar 2014 15:49:57 +0100
Subject: [PATCH] squash to fast channel change
---
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 750996b..b60812a 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -1713,8 +1713,8 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
int idx = m_pFormatContext->programs[m_program]->stream_index[i];
st = m_pFormatContext->streams[idx];
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
- return false;
+ (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE))
+ return true;
}
}
else
@@ -1723,11 +1723,11 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
{
st = m_pFormatContext->streams[i];
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
- return false;
+ (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE))
+ return true;
}
}
- return true;
+ return false;
}
void CDVDDemuxFFmpeg::ResetVideoStreams()
--
1.8.5.5