# HG changeset patch # User uau # Date 1182023256 0 # Node ID 7acb7ac641045f56315fb4b621924d6c1ad22ce8 # Parent 49bfde0ecd337043362066cf615e879248a579c2 Remove broken option reset from per-file loop When -loop is used as a per-file option it seeks back to the start of the file from the end and tries to reset options to their original values. This reset is not implemented properly: it simply sets the option variables back without running any of the associated control code. Implementing the option reset functionality properly would be a significant amount of work and there is no clear need for it, so I'm simply removing the broken version. None of this affects the use of -loop as a global option. That case has a separate implementation which always starts a new file from scratch with default option values. diff -r 49bfde0ecd33 -r 7acb7ac64104 mplayer.c --- a/mplayer.c Sat Jun 16 16:07:02 2007 +0000 +++ b/mplayer.c Sat Jun 16 19:47:36 2007 +0000 @@ -3540,9 +3540,6 @@ /* Looping. */ if(mpctx->eof==1 && loop_times>=0) { - int l = loop_times; - play_tree_iter_step(mpctx->playtree_iter,0,0); - loop_times = l; mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,mpctx->eof); if(loop_times>1) loop_times--; else