github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-18 10:25:02 +02:00
Code Releases Activity

handle the lavfpref demuxer in the same way as the lavf one

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
aurel 2008-08-27 11:31:53 +00:00
parent b5ddaf20ba
commit a5f69284d9
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
command.c
View File

@ -1356,6 +1356,7 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg,
if ((mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA
|| mpctx->demuxer->type == DEMUXER_TYPE_LAVF
|| mpctx->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED
|| mpctx->demuxer->type == DEMUXER_TYPE_OGG)
&& d_sub && d_sub->sh && dvdsub_id >= 0) {
const char* lang = ((sh_sub_t*)d_sub->sh)->lang;

3
libmpcodecs/vd_ffmpeg.c
View File

@ -755,7 +755,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
avctx->hurry_up=(flags&3)?((flags&2)?2:1):0;
if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF)
if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF &&
sh->ds->demuxer->type != DEMUXER_TYPE_LAVF_PREFERRED)
if( sh->format == mmioFOURCC('R', 'V', '1', '0')
|| sh->format == mmioFOURCC('R', 'V', '1', '3')
|| sh->format == mmioFOURCC('R', 'V', '2', '0')

1
libmpdemux/video.c
View File

@ -587,6 +587,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
}
break;
case DEMUXER_TYPE_LAVF:
case DEMUXER_TYPE_LAVF_PREFERRED:
if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){
double next_pts = ds_get_next_pts(d_video);
double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1;