diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:34 +0200 |
| commit | 73d5cf8f43786b3a643d9955e4c6499f5b391b81 (patch) | |
| tree | 8b6435ea549944a7863eda9629341a428a4ccb03 /doc/errno.txt | |
| parent | 5d199c3ad985eab4500cbfd2d1146ac70197ceac (diff) | |
| parent | 84d3ff50cd679e0f35f0b7ce2cb2cedd99169959 (diff) | |
| download | ffmpeg-73d5cf8f43786b3a643d9955e4c6499f5b391b81.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add a libwavpack encoder wrapper
Conflicts:
Changelog
doc/encoders.texi
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/errno.txt')
0 files changed, 0 insertions, 0 deletions