RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace *_index by st_index[codec_type]. 

Originally committed as revision 22003 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-02-23 16:46:40 +00:00
parent 247e3954fc
commit 6625a3de2a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ffplay.c
View File

@ -1976,16 +1976,15 @@ static int decode_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFormatContext *ic; AVFormatContext *ic;
int err, i, ret, video_index, audio_index, subtitle_index; int err, i, ret;
int st_index[CODEC_TYPE_NB];
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
AVFormatParameters params, *ap = &params; AVFormatParameters params, *ap = &params;
int eof=0; int eof=0;
ic = avformat_alloc_context(); ic = avformat_alloc_context();
video_index = -1; memset(st_index, -1, sizeof(st_index));
audio_index = -1;
subtitle_index = -1;
is->video_stream = -1; is->video_stream = -1;
is->audio_stream = -1; is->audio_stream = -1;
is->subtitle_stream = -1; is->subtitle_stream = -1;
@ -2047,15 +2046,15 @@ static int decode_thread(void *arg)
switch(avctx->codec_type) { switch(avctx->codec_type) {
case CODEC_TYPE_AUDIO: case CODEC_TYPE_AUDIO:
if (wanted_audio_stream-- >= 0 && !audio_disable) if (wanted_audio_stream-- >= 0 && !audio_disable)
audio_index = i; st_index[CODEC_TYPE_AUDIO] = i;
break; break;
case CODEC_TYPE_VIDEO: case CODEC_TYPE_VIDEO:
if (wanted_video_stream-- >= 0 && !video_disable) if (wanted_video_stream-- >= 0 && !video_disable)
video_index = i; st_index[CODEC_TYPE_VIDEO] = i;
break; break;
case CODEC_TYPE_SUBTITLE: case CODEC_TYPE_SUBTITLE:
if (wanted_subtitle_stream-- >= 0 && !video_disable) if (wanted_subtitle_stream-- >= 0 && !video_disable)
subtitle_index = i; st_index[CODEC_TYPE_SUBTITLE] = i;
break; break;
default: default:
break; break;
@ -2066,13 +2065,13 @@ static int decode_thread(void *arg)
} }
/* open the streams */ /* open the streams */
if (audio_index >= 0) { if (st_index[CODEC_TYPE_AUDIO] >= 0) {
stream_component_open(is, audio_index); stream_component_open(is, st_index[CODEC_TYPE_AUDIO]);
} }
ret=-1; ret=-1;
if (video_index >= 0) { if (st_index[CODEC_TYPE_VIDEO] >= 0) {
ret= stream_component_open(is, video_index); ret= stream_component_open(is, st_index[CODEC_TYPE_VIDEO]);
} }
if(ret<0) { if(ret<0) {
/* add the refresh timer to draw the picture */ /* add the refresh timer to draw the picture */
@ -2082,8 +2081,8 @@ static int decode_thread(void *arg)
is->show_audio = 2; is->show_audio = 2;
} }
if (subtitle_index >= 0) { if (st_index[CODEC_TYPE_SUBTITLE] >= 0) {
stream_component_open(is, subtitle_index); stream_component_open(is, st_index[CODEC_TYPE_SUBTITLE]);
} }
if (is->video_stream < 0 && is->audio_stream < 0) { if (is->video_stream < 0 && is->audio_stream < 0) {