Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 12:57:01 +0000 (13:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 12:57:05 +0000 (13:57 +0100)
commit2ed562d5fa05ae624c417210b71f6b8fdd46524d
tree73882dc00a2a484f760cd4c86dcf97030e5b9bf6
parent91a697576169a19e01202035f0fb6e0d320edff3
parent7b0a587393e03dab552d66450d43ab82bda0a5a1
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/af_pan: support unknown layouts on input.
  lavfi/af_pan: support unknown layouts on output.
  lswr: fix assert failure on unknown layouts.
  lavfi: parsing helper for unknown channel layouts.
  lavfi/avfiltergraph: do not reduce incompatible lists.
  lavfi/avfiltergraph: suggest a solution when format selection fails.
  lavd/lavfi: support unknown channel layouts.
  lavf/wavenc: check for a single stream.
  lavd/alsa: add stream validation
  lavd/alsa: fix timestamp calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>