diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:25:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:25:41 +0100 |
| commit | 858d9947e4fe1b89d3f75a2a7d9fca7e5a496062 (patch) | |
| tree | 74b916f5c88c76db861a631c58bf43daac07aac7 /libavutil/channel_layout.c | |
| parent | 9f71e5d39e0e698af05a2e6815ffff99bb493286 (diff) | |
| parent | 8a0bc40545a216a49f43db5d9a42a63961333354 (diff) | |
| download | ffmpeg-858d9947e4fe1b89d3f75a2a7d9fca7e5a496062.tar.gz | |
Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'
* commit '8a0bc40545a216a49f43db5d9a42a63961333354':
libspeex: support ZygoAudio (quality 10 mode)
Conflicts:
libavformat/isom.c
See: e26b066cd8db361feba90e943c6cfdf062c52272
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/channel_layout.c')
0 files changed, 0 insertions, 0 deletions