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

[reimar]

Author: reimar
Date: Sat Nov  6 15:31:34 2010
New Revision: 32578

Log:
Set st->discard in the same way for audio and video, fixes -aid no
longer working.

Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Wed Nov  3 17:44:13 2010	(r32577)
+++ trunk/libmpdemux/demux_lavf.c	Sat Nov  6 15:31:34 2010	(r32578)
@@ -333,11 +333,12 @@ static void handle_stream(demuxer_t *dem
             if (st->disposition & AV_DISPOSITION_DEFAULT)
               sh_audio->default_track = 1;
             if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V);
-            // select the first audio stream
-            if (!demuxer->audio->sh) {
+            // select the first audio stream if auto-selection is requested
+            if (demuxer->audio->id == -1) {
                 demuxer->audio->id = i;
                 demuxer->audio->sh= demuxer->a_streams[i];
-            } else
+            }
+            if (demuxer->audio->id != i)
                 st->discard= AVDISCARD_ALL;
             stream_id = priv->audio_streams++;
             break;
@@ -402,12 +403,13 @@ static void handle_stream(demuxer_t *dem
                 int biClrUsed;
                 int biClrImportant;
             */
-            if(demuxer->video->id != i && demuxer->video->id != -1)
-                st->discard= AVDISCARD_ALL;
-            else{
+            // select the first video stream if auto-selection is requested
+            if(demuxer->video->id == -1) {
                 demuxer->video->id = i;
                 demuxer->video->sh= demuxer->v_streams[i];
             }
+            if(demuxer->video->id != i)
+                st->discard= AVDISCARD_ALL;
             stream_id = priv->video_streams++;
             break;
         }