• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4453f6b8
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4453f6b8
flv.h 4.31 KB