From be732b708945876490f52f39d4847c31aaade559 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Tue, 28 Dec 2010 09:52:31 +0000 Subject: [PATCH] Fix ffplay -an/-vn options that were swapped by r26105. Originally committed as revision 26115 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index e49951b93e..e0cc305e77 100644 --- a/ffplay.c +++ b/ffplay.c @@ -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); }