Mercurial > mplayer.hg

changeset 31919:d9a6b45b8ef9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deobfuscate mencoder decode_video call.
author reimar
date Sat, 21 Aug 2010 11:19:45 +0000
parents 3103448dcf28
children ff8a2ac939ad
files mencoder.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Sat Aug 21 10:08:29 2010 +0000
+++ b/mencoder.c	Sat Aug 21 11:19:45 2010 +0000
@@ -1530,8 +1530,12 @@
     break;
 default:
     // decode_video will callback down to ve_*.c encoders, through the video filters
-    {void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size,
-      skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE);
+    {
+    int drop_frame = skip_flag > 0 &&
+                     (!sh_video->vfilter ||
+                      ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE);
+    void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size,
+                                       drop_frame, MP_NOPTS_VALUE);
     blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);}
 
     if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL);