# HG changeset patch
# User aurel
# Date 1219836713 0
# Node ID 16a2329e8776a3e890faae99d573f3c8d352a5d6
# Parent  8e31f43e161a46d3602abedc1cba9bad75e96f90
handle the lavfpref demuxer in the same way as the lavf one

diff -r 8e31f43e161a -r 16a2329e8776 command.c
--- a/command.c	Wed Aug 27 11:07:15 2008 +0000
+++ b/command.c	Wed Aug 27 11:31:53 2008 +0000
@@ -1356,6 +1356,7 @@
 
 	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;
diff -r 8e31f43e161a -r 16a2329e8776 libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Wed Aug 27 11:07:15 2008 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Wed Aug 27 11:31:53 2008 +0000
@@ -755,7 +755,8 @@
 
     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')
diff -r 8e31f43e161a -r 16a2329e8776 libmpdemux/video.c
--- a/libmpdemux/video.c	Wed Aug 27 11:07:15 2008 +0000
+++ b/libmpdemux/video.c	Wed Aug 27 11:31:53 2008 +0000
@@ -587,6 +587,7 @@
       }
       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;