mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-04 19:17:28 +00:00
reindented after previous commit
Originally committed as revision 10867 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
50e143c4be
commit
a15bc651f9
34
ffmpeg.c
34
ffmpeg.c
@ -1512,30 +1512,30 @@ 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++) {
|
for(j=0;j<nb_istreams;j++) {
|
||||||
ist = ist_table[j];
|
ist = ist_table[j];
|
||||||
if (ist->discard &&
|
if (ist->discard &&
|
||||||
ist->st->codec->codec_type == ost->st->codec->codec_type) {
|
ist->st->codec->codec_type == ost->st->codec->codec_type) {
|
||||||
ost->source_index = j;
|
ost->source_index = j;
|
||||||
found = 1;
|
found = 1;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!found) {
|
if (!found) {
|
||||||
if(! opt_programid) {
|
if(! opt_programid) {
|
||||||
/* try again and reuse existing stream */
|
/* 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->st->codec->codec_type == ost->st->codec->codec_type) {
|
||||||
ost->source_index = j;
|
ost->source_index = j;
|
||||||
found = 1;
|
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",
|
||||||
ost->file_index, ost->index);
|
ost->file_index, ost->index);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user