Commit 1b62c890 authored by michael's avatar michael

fix indention (dunno why it was messed up ...)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7592 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9ae6ac5d
...@@ -519,38 +519,37 @@ static int avi_write_trailer(AVFormatContext *s) ...@@ -519,38 +519,37 @@ static int avi_write_trailer(AVFormatContext *s)
int i, j, n, nb_frames; int i, j, n, nb_frames;
offset_t file_size; offset_t file_size;
if (!url_is_streamed(pb)) if (!url_is_streamed(pb)){
{ if (avi->riff_id == 1) {
if (avi->riff_id == 1) { end_tag(pb, avi->movi_list);
end_tag(pb, avi->movi_list); res = avi_write_idx1(s);
res = avi_write_idx1(s); end_tag(pb, avi->riff_start);
end_tag(pb, avi->riff_start); } else {
} else { avi_write_ix(s);
avi_write_ix(s); end_tag(pb, avi->movi_list);
end_tag(pb, avi->movi_list); end_tag(pb, avi->riff_start);
end_tag(pb, avi->riff_start);
file_size = url_ftell(pb);
file_size = url_ftell(pb); url_fseek(pb, avi->odml_list - 8, SEEK_SET);
url_fseek(pb, avi->odml_list - 8, SEEK_SET); put_tag(pb, "LIST"); /* Making this AVI OpenDML one */
put_tag(pb, "LIST"); /* Making this AVI OpenDML one */ url_fskip(pb, 16);
url_fskip(pb, 16);
for (n=nb_frames=0;n<s->nb_streams;n++) {
for (n=nb_frames=0;n<s->nb_streams;n++) { AVCodecContext *stream = s->streams[n]->codec;
AVCodecContext *stream = s->streams[n]->codec; if (stream->codec_type == CODEC_TYPE_VIDEO) {
if (stream->codec_type == CODEC_TYPE_VIDEO) { if (nb_frames < avi->packet_count[n])
if (nb_frames < avi->packet_count[n]) nb_frames = avi->packet_count[n];
nb_frames = avi->packet_count[n]; } else {
} else { if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) {
if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) { nb_frames += avi->packet_count[n];
nb_frames += avi->packet_count[n]; }
} }
} }
} put_le32(pb, nb_frames);
put_le32(pb, nb_frames); url_fseek(pb, file_size, SEEK_SET);
url_fseek(pb, file_size, SEEK_SET);
avi_write_counters(s, avi->riff_id); avi_write_counters(s, avi->riff_id);
} }
} }
put_flush_packet(pb); put_flush_packet(pb);
......
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