diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 23:57:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 23:57:31 +0200 |
| commit | 4453f6b8613b0803246c1a9160c8270ec9de1237 (patch) | |
| tree | 3a641fda838ccb4130bbf5e2d1d29c8bbcc69fa4 /library.mak | |
| parent | 7877b50d181be1e044eb8b57f203c763297651b1 (diff) | |
| parent | b92c7ee662b618518bff366af3274784fb141dde (diff) | |
| download | ffmpeg-4453f6b8613b0803246c1a9160c8270ec9de1237.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flv: add support for G.711
doc: git: Add checklist with test steps to perform before pushing
flvenc: K&R formatting cosmetics
movenc: Add channel layouts for PCM.
Conflicts:
libavformat/flvenc.c
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions