• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 175cc378
    Michael Niedermayer authored
    * qatar/master:
      movenc: Rudimentary IODs support.
      v410enc: fix output buffer size check
      v410enc: include correct headers
      fate: add -pix_fmt rgb48le to r210 test
      flvenc: Support muxing 16 kHz nellymoser
      configure: refactor list of programs into a variable
      fate: add r210 decoder test
      fate: split off Indeo FATE tests into their own file
      fate: split off ATRAC FATE tests into their own file
      fate: Add FATE tests for v410 encoder and decoder
      ARM: fix external symbol refs in rv40 asm
      westwood: Make sure audio header info is present when parsing audio packets
      libgsm: Reset the MS mode of GSM in the flush function
      libgsm: Set options on the right object
      ARM: dca: disable optimised decode_blockcodes() for old gcc
    
    Conflicts:
    	configure
    	libavformat/movenc.c
    	libavformat/movenc.h
    	tests/fate2.mak
    	tests/ref/acodec/alac
    	tests/ref/vsynth1/mpeg4
    	tests/ref/vsynth2/mpeg4
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    175cc378
flvenc.c 17.5 KB