[FFmpeg-devel] [PATCH] ffprobe: fix scaling of vali

[Stefano Sabatini]

On date Wednesday 2014-04-23 01:10:32 +0200, Michael Niedermayer encoded:
> On Wed, Apr 23, 2014 at 12:56:18AM +0200, Stefano Sabatini wrote:
> > On date Monday 2014-04-21 13:06:36 +0200, Michael Niedermayer encoded:
> > > Fixes Ticket3523
> > > 
> > > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > > ---
> > >  ffprobe.c |    5 +++--
> > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/ffprobe.c b/ffprobe.c
> > > index 9e39ff7..bc2497c 100644
> > > --- a/ffprobe.c
> > > +++ b/ffprobe.c
> > > @@ -217,7 +217,7 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv)
> > >          vald = uv.val.d;
> > >          show_float = 1;
> > >      } else {
> > > -        vald = vali = uv.val.i;
> > > +        vald = uv.val.i;
> > >      }
> > >  
> > >      if (uv.unit == unit_second_str && use_value_sexagesimal_format) {
> > > @@ -247,8 +247,9 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv)
> > >                  prefix_string = decimal_unit_prefixes[index];
> > >              }
> > >          }
> > > +        vali = vald;
> > >  
> > > -        if (show_float || (use_value_prefix && vald != (long long int)vald))
> > > +        if (show_float || (use_value_prefix && vald != vali))
> > >              snprintf(buf, buf_size, "%f", vald);
> > >          else
> > >              snprintf(buf, buf_size, "%lld", vali);
> > 
> > Probably simpler in attachment (rescaling and lossy int->double
> > conversion only done in case -prefix is used).
> 
> sure, prefectly fine with me too

Applied, thanks.
-- 
FFmpeg = Fast Faithless Moronic Picky Enhancing Glue