summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-31 15:44:41 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-31 15:44:41 +0000
commit6740811112273abc8fd378edf55b94a291233bba (patch)
treec8a95661ced1f2d58b62b6337a474190fd72f51f
parenta63ea1a018ca781936dc0d4663b249676382844f (diff)
downloadmpv-6740811112273abc8fd378edf55b94a291233bba.tar.bz2
mpv-6740811112273abc8fd378edf55b94a291233bba.tar.xz
removed buggy fd<0 check for disallowing dumpstream/cache
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7203 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/cache2.c11
-rw-r--r--mplayer.c10
2 files changed, 12 insertions, 9 deletions
diff --git a/libmpdemux/cache2.c b/libmpdemux/cache2.c
index 4aa65e6045..e42fe41ce2 100644
--- a/libmpdemux/cache2.c
+++ b/libmpdemux/cache2.c
@@ -200,11 +200,12 @@ 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;
- 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;
- }
+// 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(size<32*1024) size=32*1024; // 32kb min
s=cache_init(size,ss);
diff --git a/mplayer.c b/mplayer.c
index 30d85d73d9..887b6053ad 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1021,10 +1021,11 @@ if(stream_dump_type==5){
int len;
FILE *f;
current_module="dumpstream";
- if(stream->fd<0){
- mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n");
- exit_player(MSGTR_Exit_error);
- }
+// 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);
+// }
stream_reset(stream);
stream_seek(stream,stream->start_pos);
f=fopen(stream_dump_name,"wb");
@@ -1221,6 +1222,7 @@ current_module="find_audio_codec";
if(sh_audio){
// Go through the codec.conf and find the best codec...
sh_audio->codec=NULL;
+ mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
if(audio_fm) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmtStr,audio_fm);
while(1){
sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1);