RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

removed buggy fd<0 check for disallowing dumpstream/cache 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7203 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-08-31 15:44:41 +00:00
parent a63ea1a018
commit 6740811112
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libmpdemux/cache2.c
View File

@ -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);

10
mplayer.c
View File

@ -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);