[FFmpeg-devel] [PATCH] doc/filters: amix only works with float samples

[Michael Niedermayer]

On Mon, May 26, 2014 at 12:53:27PM -0800, Lou Logan wrote:
> On Mon, 26 May 2014 12:49:39 -0800, Lou Logan wrote:
> 
> > Signed-off-by: Lou Logan <lou at lrcd.com>
> > ---
> >  doc/filters.texi | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/doc/filters.texi b/doc/filters.texi
> > index bcaa632..990e6ca 100644
> > --- a/doc/filters.texi
> > +++ b/doc/filters.texi
> > @@ -697,6 +697,11 @@ ffmpeg -i input.mkv -filter_complex "[0:1][0:2][0:3][0:4][0:5][0:6] amerge=input
> >  
> >  Mixes multiple audio inputs into a single output.
> >  
> > +Note that this filter can only work with float samples (the @ref{amerge}
> > +and @ref{pan} audio filters support many formats). If the @var{amix}
> > +input has integer samples then @ref{aresample} will be automatically
> > +inserted to perform the conversion.
> 
> Send old patch by mistake. amerge and pan @ref locally changed to @var.

patch probably ok, maybe wording it a bit more like
"only support ..." instead of can only

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140527/0b3f2ba5/attachment.asc>