Mercurial > mplayer.hg
diff mencoder.c @ 31972:96559880e475
Improve A/V sync when not using -correct-pts.
This fixes at least playing PAFF streams with the native ts demuxer.
(Breaks the non-standard -demuxer lavf -nocorrect-pts.)
Patch by P«”sztor Szil«”rd, bartosteka freemail hu
| author | cehoyos |
|---|---|
| date | Tue, 07 Sep 2010 16:20:52 +0000 |
| parents | 67b33b7e3b4c |
| children | 4a4dcc72da52 |
line wrap: on
line diff
--- a/mencoder.c Tue Sep 07 16:14:56 2010 +0000 +++ b/mencoder.c Tue Sep 07 16:20:52 2010 +0000 @@ -464,7 +464,7 @@ if (vfilter) { int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE); - void *decoded_frame = decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE); + void *decoded_frame = decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE, NULL); if (decoded_frame) filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE); } @@ -1535,7 +1535,7 @@ (!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); + drop_frame, MP_NOPTS_VALUE, NULL); blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);} if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL);