diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 13:57:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 13:57:05 +0100 |
| commit | 2ed562d5fa05ae624c417210b71f6b8fdd46524d (patch) | |
| tree | 73882dc00a2a484f760cd4c86dcf97030e5b9bf6 /libavcodec/g726.c | |
| parent | 91a697576169a19e01202035f0fb6e0d320edff3 (diff) | |
| parent | 7b0a587393e03dab552d66450d43ab82bda0a5a1 (diff) | |
| download | ffmpeg-2ed562d5fa05ae624c417210b71f6b8fdd46524d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/g726.c')
0 files changed, 0 insertions, 0 deletions