From c2ffe44a28afb9aea4477535197c52e19f3746a5 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 22 Jan 2010 23:19:59 +0000 Subject: Remove any auto-inserted lavc filter. Makes sure it will not be around if we e.g. try again with a different codec, which can lead to -vo null being excessively slow. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30391 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libmpcodecs/vd.c') diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 3de3c1525a..29d0a1a612 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -206,7 +206,7 @@ csp_again: goto csp_again; } else { // sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc - vf_instance_t* vo, *vp = NULL, *ve; + vf_instance_t* vo, *vp = NULL, *ve, *vpp = NULL; // Remove the scale filter if we added it ourself if(vf == sc) { ve = vf; @@ -214,14 +214,21 @@ csp_again: vf_uninit_filter(ve); } // Find the last filter (vf_vo) - for(vo = vf ; vo->next ; vo = vo->next) + for(vo = vf ; vo->next ; vo = vo->next) { + vpp = vp; vp = vo; + } if(vo->query_format(vo,IMGFMT_MPEGPES) && (!vp || (vp && strcmp(vp->info->name,"lavc")))) { ve = vf_open_filter(vo,"lavc",NULL); if(vp) vp->next = ve; else vf = ve; goto csp_again; } + if (vp && !strcmp(vp->info->name,"lavc")) { + if (vpp) vpp->next = vo; + else vf = vo; + vf_uninit_filter(vp); + } } mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_VOincompCodec); sh->vf_initialized=-1; -- cgit v1.2.3