[MPlayer-cvslog] r27489 - in trunk: command.c libmpcodecs/vd_ffmpeg.c libmpdemux/video.c

[aurel]

Author: aurel
Date: Wed Aug 27 13:31:53 2008
New Revision: 27489

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

Modified:
   trunk/command.c
   trunk/libmpcodecs/vd_ffmpeg.c
   trunk/libmpdemux/video.c

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	(original)
+++ trunk/command.c	Wed Aug 27 13:31:53 2008
@@ -1356,6 +1356,7 @@ static int mp_property_sub(m_option_t * 
 
 	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;

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	(original)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Wed Aug 27 13:31:53 2008
@@ -755,7 +755,8 @@ static mp_image_t* decode(sh_video_t *sh
 
     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')

Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c	(original)
+++ trunk/libmpdemux/video.c	Wed Aug 27 13:31:53 2008
@@ -587,6 +587,7 @@ int video_read_frame(sh_video_t* sh_vide
       }
       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;