diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2010-12-28 09:52:31 +0000 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2010-12-28 09:52:31 +0000 |
commit | be732b708945876490f52f39d4847c31aaade559 (patch) | |
tree | 4e10a18f6ac74650d8f26c276c8c43fa69fcaa82 /ffplay.c | |
parent | bb50ed089f29d13ecd2cc18dd01c4de88653351a (diff) | |
download | ffmpeg-be732b708945876490f52f39d4847c31aaade559.tar.gz |
Fix ffplay -an/-vn options that were swapped by r26105.
Originally committed as revision 26115 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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); } |