Skip to content

F
ffmpeg-mt
Commit 64c72553 authored by nicodvb's avatar nicodvb
Browse files
Options

reindented after previous commit 

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10867 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d02014d2
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
ffmpeg.c
View file @ 64c72553
...@@ -1512,29 +1512,29 @@ static int av_encode(AVFormatContext **output_files, ...@@ -1512,29 +1512,29 @@ static int av_encode(AVFormatContext **output_files,
found = 1; found = 1;
} }
} else { } else {
/* get corresponding input stream index : we select the first one with the right type */ /* get corresponding input stream index : we select the first one with the right type */
found = 0; found = 0;
for(j=0;j<nb_istreams;j++) {
ist = ist_table[j];
if (ist->discard &&
ist->st->codec->codec_type == ost->st->codec->codec_type) {
ost->source_index = j;
found = 1;
break;
}
}
}
if (!found) {
if(! opt_programid) {
/* try again and reuse existing stream */
for(j=0;j<nb_istreams;j++) { for(j=0;j<nb_istreams;j++) {
ist = ist_table[j]; ist = ist_table[j];
if (ist->st->codec->codec_type == ost->st->codec->codec_type) { if (ist->discard &&
ist->st->codec->codec_type == ost->st->codec->codec_type) {
ost->source_index = j; ost->source_index = j;
found = 1; found = 1;
break;
} }
} }
}
if (!found) {
if(! opt_programid) {
/* try again and reuse existing stream */
for(j=0;j<nb_istreams;j++) {
ist = ist_table[j];
if (ist->st->codec->codec_type == ost->st->codec->codec_type) {
ost->source_index = j;
found = 1;
}
}
} }
if (!found) { if (!found) {
fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n", fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment