summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-06 22:05:01 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-06 22:05:01 +0000
commite24cd4d942c0e7261709b4eaca527cfc9750c619 (patch)
tree73812111226d414f6c8516c3b19658f181a4f6b0 /mplayer.c
parent55bafcc362e9ec4ea5883bef9e9e30469b6f7517 (diff)
downloadmpv-e24cd4d942c0e7261709b4eaca527cfc9750c619.tar.bz2
mpv-e24cd4d942c0e7261709b4eaca527cfc9750c619.tar.xz
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5508 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 801edb1edb..f8b1319cf0 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1163,7 +1163,7 @@ if (vo_spudec!=NULL)
}
//================== Init AUDIO (codec) ==========================
-current_module="init_audio_codec";
+current_module="find_audio_codec";
if(sh_audio){
// Go through the codec.conf and find the best codec...
@@ -1191,6 +1191,8 @@ if(sh_audio){
}
}
+current_module="init_audio_codec";
+
if(sh_audio){
mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n");
if(!init_audio(sh_audio)){
@@ -1215,6 +1217,11 @@ if((video_out->preinit(vo_subdevice))!=0){
sh_video->video_out=video_out;
inited_flags|=INITED_VO;
+current_module="init_video_filters";
+
+sh_video->vfilter=vf_open_filter(NULL,"vo",video_out);
+sh_video->vfilter=append_filters(sh_video->vfilter);
+
current_module="init_video_codec";
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
@@ -1524,7 +1531,7 @@ if(1)
// decode:
current_module="decode_video";
// printf("Decode! %p %d \n",start,in_size);
- blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame);
+ blit_frame=decode_video(sh_video,start,in_size,drop_frame);
}
vdecode_time=video_time_usage-vdecode_time;
//------------------------ frame decoded. --------------------