Anton Khirnov <an...@khirnov.net> writes:

> From: Michael Niedermayer <michae...@gmx.at>
>
> Signed-off-by: Anton Khirnov <an...@khirnov.net>
> ---
>  ffmpeg.c |   13 ++++++-------
>  1 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/ffmpeg.c b/ffmpeg.c
> index 016eeb4..fce5843 100644
> --- a/ffmpeg.c
> +++ b/ffmpeg.c
> @@ -1330,26 +1330,25 @@ static void print_report(AVFormatContext 
> **output_files,
>      ti1 = 1e10;
>      vid = 0;
>      for(i=0;i<nb_ostreams;i++) {
> +        float q = -1;
>          ost = ost_table[i];
>          enc = ost->st->codec;
> +        if (!ost->st->stream_copy && enc->coded_frame)
> +            q = enc->coded_frame->quality/(float)FF_QP2LAMBDA;
>          if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
> -            snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f 
> ",
> -                     !ost->st->stream_copy ?
> -                     enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1);
> +            snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f 
> ", q);
>          }
>          if (!vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
>              float t = (av_gettime()-timer_start) / 1000000.0;
>  
>              frame_number = ost->frame_number;
>              snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), 
> "frame=%5d fps=%3d q=%3.1f ",
> -                     frame_number, (t>1)?(int)(frame_number/t+0.5) : 0,
> -                     !ost->st->stream_copy ?
> -                     enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1);
> +                     frame_number, (t>1)?(int)(frame_number/t+0.5) : 0, q);
>              if(is_last_report)
>                  snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L");
>              if(qp_hist){
>                  int j;
> -                int qp= 
> lrintf(enc->coded_frame->quality/(float)FF_QP2LAMBDA);
> +                int qp = lrintf(q);
>                  if(qp>=0 && qp<FF_ARRAY_ELEMS(qp_histogram))
>                      qp_histogram[qp]++;
>                  for(j=0; j<32; j++)
> -- 
> 1.7.5.1

Where is the "segfault"?

-- 
Måns Rullgård
m...@mansr.com
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to