Merge svn changes up to r31211

The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.

1 files changed, 1 insertions, 1 deletions

diff --git a/mplayer.c b/mplayer.c
index 0120c20c18..fdead085ba 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2468,7 +2468,7 @@ static double update_video(struct MPContext *mpctx)
         if (in_size < 0) {
             // try to extract last frames in case of decoder lag
             in_size = 0;
-            pts = 1e300;
+            pts = MP_NOPTS_VALUE;
             hit_eof = true;
         }
         if (in_size > max_framesize)