diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-01 02:03:58 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-01 02:03:58 +0000 |
| commit | 2678394202766a1344f2f7f0b9b50c0a50bc3b63 (patch) | |
| tree | 3ac6d66db89398664dd43240d7bc69dd4394ee76 /libmpdemux/demux_lavf.c | |
| parent | 4cd5847495b35b34b05d6d4facd22d00380ee950 (diff) | |
| download | mpv-2678394202766a1344f2f7f0b9b50c0a50bc3b63.tar.bz2 mpv-2678394202766a1344f2f7f0b9b50c0a50bc3b63.tar.xz | |
LIBAVFORMAT_BUILD >= 4624
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15309 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_lavf.c')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 6e2154762f..13dbf3d21b 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -236,8 +236,13 @@ int demux_open_lavf(demuxer_t *demuxer){ sh_video->bih= bih; sh_video->disp_w= codec->width; sh_video->disp_h= codec->height; +#if LIBAVFORMAT_BUILD >= 4624 + sh_video->video.dwRate= codec->time_base.den; + sh_video->video.dwScale= codec->time_base.num; +#else sh_video->video.dwRate= codec->frame_rate; sh_video->video.dwScale= codec->frame_rate_base; +#endif sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; sh_video->format = bih->biCompression; @@ -339,8 +344,13 @@ int demux_lavf_fill_buffer(demuxer_t *demux){ } if(pkt.pts != AV_NOPTS_VALUE){ +#if LIBAVFORMAT_BUILD >= 4624 + dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); + priv->last_pts= dp->pts * AV_TIME_BASE; +#else priv->last_pts= pkt.pts; dp->pts=pkt.pts / (float)AV_TIME_BASE; +#endif } dp->pos=demux->filepos; dp->flags= !!(pkt.flags&PKT_FLAG_KEY); |