diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-12 10:40:38 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-12 10:40:38 +0000 |
| commit | e40b5a0509ebee9406e4651c99f3c7f89bd89ac8 (patch) | |
| tree | 4bbc67311223c1ba0d746b9cf4a375e119220ad3 /libmpdemux/video.c | |
| parent | 90bfc582ca7c54b57c2c303ec8b43b00dd45d8d9 (diff) | |
| download | mpv-e40b5a0509ebee9406e4651c99f3c7f89bd89ac8.tar.bz2 mpv-e40b5a0509ebee9406e4651c99f3c7f89bd89ac8.tar.xz | |
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
- tvi interface changes, grab_audio/video now returns timestamp!
- tv demuxer gets 'ds' hint too
- some verbose skip/dup counters to mencoder
- tvi_bsdbt848.c updates
- aviwrite/mencoder size types int->off_t
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5573 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/video.c')
| -rw-r--r-- | libmpdemux/video.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 3e9af04cba..a532a77093 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -291,6 +291,10 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** sh_video->fps=1.0f/d; } } else + if(demuxer->file_format==DEMUXER_TYPE_TV && !force_fps){ + // TV has variable video frame rate, fixed audio... + frame_time=d_video->pts-pts1; + } else if(demuxer->file_format==DEMUXER_TYPE_MOV && !force_fps){ // .MOV files has no fixed FPS - just frame durations! frame_time=d_video->pts-pts1; |