diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
index 77ad615..bcab2dc 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -3316,9 +3316,9 @@ bool MythPlayer::DecoderGetFrame(DecodeType decodetype, bool unsafe)
{
if (++videobuf_retries >= 2000)
{
- LOG(VB_GENERAL, LOG_ERR, LOC +
- "Decoder timed out waiting for free video buffers.");
- videobuf_retries = 0;
+ // We've tried for 20 seconds now, give up so that we don't
+ // get stuck permanently in this state
+ SetErrored("Decoder timed out waiting for free video buffers.");
}
return false;
}