summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-17 02:18:10 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-17 05:04:32 +0300
commit68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch)
treeb6b00fd57b24e713e0dc180b64d266b958df7daa /mplayer.c
parentaf3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff)
parentdcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff)
downloadmpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2
mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz
Merge svn changes up to r27092
Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 44b47356a2..5eed63293c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3207,7 +3207,7 @@ if(stream_dump_type==5){
int chapter = dvd_chapter - 1;
stream_control(mpctx->stream, STREAM_CTRL_SEEK_TO_CHAPTER, &chapter);
}
- while(!mpctx->stream->eof){
+ while(!mpctx->stream->eof && !async_quit_request){
len=stream_read(mpctx->stream,buf,4096);
if(len>0) {
if(fwrite(buf,len,1,f) != 1) {