Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Jun 2012 21:57:31 +0000 (23:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Jun 2012 21:57:31 +0000 (23:57 +0200)
commit4453f6b8613b0803246c1a9160c8270ec9de1237
tree3a641fda838ccb4130bbf5e2d1d29c8bbcc69fa4
parent7877b50d181be1e044eb8b57f203c763297651b1
parentb92c7ee662b618518bff366af3274784fb141dde
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>
doc/git-howto.texi
libavformat/flv.h
libavformat/flvdec.c
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