diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-21 21:26:42 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-21 21:26:42 +0000 |
| commit | 02b199e5e93926cc106774068eb3e883826c3ae4 (patch) | |
| tree | 4dfe84f1d807e9fc598c347511bb9dfa84157500 /libmpcodecs/vf_lavc.c | |
| parent | aa6943767de4902e5b29e9952e252a1e75aac7ac (diff) | |
| download | mpv-02b199e5e93926cc106774068eb3e883826c3ae4.tar.bz2 mpv-02b199e5e93926cc106774068eb3e883826c3ae4.tar.xz | |
passing pts through the filter layer (lets see if pts or cola comes out at the end)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vf_lavc.c')
| -rw-r--r-- | libmpcodecs/vf_lavc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c index 59f5c9cf46..4a7966e709 100644 --- a/libmpcodecs/vf_lavc.c +++ b/libmpcodecs/vf_lavc.c @@ -115,7 +115,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t* dmpi; int out_size; AVFrame *pic= vf->priv->pic; @@ -143,7 +143,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi->planes[0]=(unsigned char*)&vf->priv->pes; - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, MP_NOPTS_VALUE); } //===========================================================================// @@ -203,7 +203,7 @@ static int open(vf_instance_t *vf, char* args){ } #if LIBAVCODEC_BUILD >= 4754 lavc_venc_context.time_base.num = 1000*1001; - lavc_venc_context.time_base.den = (p_fps<1.0) ? 0 : (p_fps * lavc_venc_context.time_base.num); + lavc_venc_context.time_base.den = (p_fps<1.0) ? 1000*1001*25 : (p_fps * lavc_venc_context.time_base.num); #else #if LIBAVCODEC_BUILD >= 4662 lavc_venc_context.frame_rate_base = 1000*1001; |