[MPlayer-cvslog] r29845 - trunk/libmpdemux/demux_lavf.c

[reimar]

Author: reimar
Date: Sat Nov  7 12:09:23 2009
New Revision: 29845

Log:
Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
instead of incorrectly claiming that the demuxer does not support programs.

Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Sat Nov  7 10:23:11 2009	(r29844)
+++ trunk/libmpdemux/demux_lavf.c	Sat Nov  7 12:09:23 2009	(r29845)
@@ -711,8 +711,9 @@ static int demux_lavf_control(demuxer_t 
             int p, i;
             int start;
 
-            if(priv->avfc->nb_programs < 2)
-                return DEMUXER_CTRL_NOTIMPL;
+            prog->vid = prog->aid = prog->sid = -2;	//no audio and no video by default
+            if(priv->avfc->nb_programs < 1)
+                return DEMUXER_CTRL_DONTKNOW;
 
             if(prog->progid == -1)
             {
@@ -727,10 +728,9 @@ static int demux_lavf_control(demuxer_t 
                     if(priv->avfc->programs[i]->id == prog->progid)
                         break;
                 if(i==priv->avfc->nb_programs)
-                    return DEMUXER_CTRL_NOTIMPL;
+                    return DEMUXER_CTRL_DONTKNOW;
                 p = i;
             }
-            prog->vid = prog->aid = prog->sid = -2;	//no audio and no video by default
             start = p;
 redo:
             program = priv->avfc->programs[p];