Browse Source

Fix ffplay -an/-vn options that were swapped by r26105.

Originally committed as revision 26115 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Nicolas George 15 years ago
parent
commit
be732b7089
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      ffplay.c

+ 3
- 3
ffplay.c View File

@@ -2466,16 +2466,17 @@ static int decode_thread(void *arg)

for (i = 0; i < ic->nb_streams; i++)
ic->streams[i]->discard = AVDISCARD_ALL;
if (!audio_disable)
if (!video_disable)
st_index[AVMEDIA_TYPE_VIDEO] =
av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
if (!video_disable) {
if (!audio_disable)
st_index[AVMEDIA_TYPE_AUDIO] =
av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
wanted_stream[AVMEDIA_TYPE_AUDIO],
st_index[AVMEDIA_TYPE_VIDEO],
NULL, 0);
if (!video_disable)
st_index[AVMEDIA_TYPE_SUBTITLE] =
av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
wanted_stream[AVMEDIA_TYPE_SUBTITLE],
@@ -2483,7 +2484,6 @@ static int decode_thread(void *arg)
st_index[AVMEDIA_TYPE_AUDIO] :
st_index[AVMEDIA_TYPE_VIDEO]),
NULL, 0);
}
if (show_status) {
dump_format(ic, 0, is->filename, 0);
}


Loading…
Cancel
Save