virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 26115 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Nicolas George 2010-12-28 09:52:31 +00:00
parent bb50ed089f
commit be732b7089
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplay.c
View File

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