ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: make timer_start a local var in transcode().

Browse Source
This commit is contained in:
Anton Khirnov 2011-08-30 15:46:24 +02:00 committed by Michael Niedermayer
parent 3a7b4ccd1c
commit 6bdd9fbc89
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

@ -222,8 +222,6 @@ static char *forced_key_frames = NULL;
static float dts_delta_threshold = 10; static float dts_delta_threshold = 10;
static int64_t timer_start;
static uint8_t *audio_buf; static uint8_t *audio_buf;
static uint8_t *audio_out; static uint8_t *audio_out;
static unsigned int allocated_audio_out_size, allocated_audio_buf_size; static unsigned int allocated_audio_out_size, allocated_audio_buf_size;
@ -1311,7 +1309,7 @@ static void do_video_stats(AVFormatContext *os, OutputStream *ost,
static void print_report(OutputFile *output_files, static void print_report(OutputFile *output_files,
OutputStream *ost_table, int nb_ostreams, OutputStream *ost_table, int nb_ostreams,
int is_last_report) int is_last_report, int64_t timer_start)
{ {
char buf[1024]; char buf[1024];
OutputStream *ost; OutputStream *ost;
@ -1903,6 +1901,7 @@ static int transcode(OutputFile *output_files,
int want_sdp = 1; int want_sdp = 1;
uint8_t *no_packet; uint8_t *no_packet;
int no_packet_count=0; int no_packet_count=0;
int64_t timer_start;
if (!(no_packet = av_mallocz(nb_input_files))) if (!(no_packet = av_mallocz(nb_input_files)))
exit_program(1); exit_program(1);
@ -2485,7 +2484,7 @@ static int transcode(OutputFile *output_files,
av_free_packet(&pkt); av_free_packet(&pkt);
/* dump report by using the output first video and audio streams */ /* dump report by using the output first video and audio streams */
print_report(output_files, output_streams, nb_output_streams, 0); print_report(output_files, output_streams, nb_output_streams, 0, timer_start);
} }
/* at the end of stream, we must flush the decoder buffers */ /* at the end of stream, we must flush the decoder buffers */
@ -2505,7 +2504,7 @@ static int transcode(OutputFile *output_files,
} }
/* dump report by using the first video and audio streams */ /* dump report by using the first video and audio streams */
print_report(output_files, output_streams, nb_output_streams, 1); print_report(output_files, output_streams, nb_output_streams, 1, timer_start);
/* close each encoder */ /* close each encoder */
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {