fix cache disable for live.com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7205 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 9 insertions, 11 deletions

diff --git a/libmpdemux/cache2.c b/libmpdemux/cache2.c
index e42fe41ce2..d787b007fe 100644
--- a/libmpdemux/cache2.c
+++ b/libmpdemux/cache2.c
@@ -200,12 +200,11 @@ int stream_enable_cache(stream_t *stream,int size,int min,int prefill){
   int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
   cache_vars_t* s;
 
-// this check is bad! for example DVD, CDDA etc support uses stream but fd=-1 !
-//  if (stream->fd < 0) {
-//    // The stream has no 'fd' behind it, so is non-cacheable
-//    mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
-//    return 1;
-//  }
+  if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) {
+    // The stream has no 'fd' behind it, so is non-cacheable
+    mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
+    return 1;
+  }
 
   if(size<32*1024) size=32*1024; // 32kb min
   s=cache_init(size,ss);
diff --git a/mplayer.c b/mplayer.c
index 887b6053ad..dce3a70b9e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1021,11 +1021,10 @@ if(stream_dump_type==5){
   int len;
   FILE *f;
   current_module="dumpstream";
-// this check is bad! for example DVD, CDDA etc support uses stream but fd=-1 !
-//  if(stream->fd<0){
-//    mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n");
-//    exit_player(MSGTR_Exit_error);
-//  }
+  if(stream->type==STREAMTYPE_STREAM && stream->fd<0){
+    mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n");
+    exit_player(MSGTR_Exit_error);
+  }
   stream_reset(stream);
   stream_seek(stream,stream->start_pos);
   f=fopen(stream_dump_name,"wb");