[FFmpeg-cvslog] ffmpeg: move close_output_stream earlier.
Nicolas George
git at videolan.org
Wed Aug 22 19:20:00 CEST 2012
ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon Aug 20 10:57:18 2012 +0200| [666fd092beede8694684e0ea663fcdf732c64a03] | committer: Nicolas George
ffmpeg: move close_output_stream earlier.
It will avoid a forward declaration.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=666fd092beede8694684e0ea663fcdf732c64a03
---
ffmpeg.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 597c051..c39e5a3 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -572,6 +572,18 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
}
}
+static void close_output_stream(OutputStream *ost)
+{
+ OutputFile *of = output_files[ost->file_index];
+
+ ost->finished = 1;
+ if (of->shortest) {
+ int i;
+ for (i = 0; i < of->ctx->nb_streams; i++)
+ output_streams[of->ost_index + i]->finished = 1;
+ }
+}
+
static int check_recording_time(OutputStream *ost)
{
OutputFile *of = output_files[ost->file_index];
@@ -2661,18 +2673,6 @@ static void reset_eagain(void)
output_streams[i]->unavailable = 0;
}
-static void close_output_stream(OutputStream *ost)
-{
- OutputFile *of = output_files[ost->file_index];
-
- ost->finished = 1;
- if (of->shortest) {
- int i;
- for (i = 0; i < of->ctx->nb_streams; i++)
- output_streams[of->ost_index + i]->finished = 1;
- }
-}
-
/**
* @return
* - 0 -- one packet was read and processed
More information about the ffmpeg-cvslog
mailing list