RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: do not print misleading recommanditions on 1pass vpx encoding 

Fixes part of Ticket4295

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-26 23:42:44 +02:00
parent 4ae090f224
commit 4fe38441b0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffmpeg.c
View File

@ -1342,6 +1342,7 @@ static void print_final_stats(int64_t total_size)
uint64_t data_size = 0; uint64_t data_size = 0;
float percent = -1.0; float percent = -1.0;
int i, j; int i, j;
int pass1_used = 1;
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {
OutputStream *ost = output_streams[i]; OutputStream *ost = output_streams[i];
@ -1353,6 +1354,9 @@ static void print_final_stats(int64_t total_size)
} }
extra_size += ost->enc_ctx->extradata_size; extra_size += ost->enc_ctx->extradata_size;
data_size += ost->data_size; data_size += ost->data_size;
if ( (ost->enc_ctx->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))
!= CODEC_FLAG_PASS1)
pass1_used = 0;
} }
if (data_size && total_size>0 && total_size >= data_size) if (data_size && total_size>0 && total_size >= data_size)
@ -1439,7 +1443,12 @@ static void print_final_stats(int64_t total_size)
total_packets, total_size); total_packets, total_size);
} }
if(video_size + data_size + audio_size + subtitle_size + extra_size == 0){ if(video_size + data_size + audio_size + subtitle_size + extra_size == 0){
av_log(NULL, AV_LOG_WARNING, "Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)\n"); av_log(NULL, AV_LOG_WARNING, "Output file is empty, nothing was encoded ");
if (pass1_used) {
av_log(NULL, AV_LOG_WARNING, "\n");
} else {
av_log(NULL, AV_LOG_WARNING, "(check -ss / -t / -frames parameters if used)\n");
}
} }
} }