• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a7acab6c
    Michael Niedermayer authored
    * qatar/master:
      vc1dec: Remove separate scaling function for interlaced field MVs
      vc1dec: Invoke edge_emulation regardless of MV precision
      x86: Use consistent 3dnowext function and macro name suffixes
      g723_1: scale output as supposed for the case with postfilter disabled
      g723_1: increase excitation storage by 4
      g723_1: fix upper bound parameter from inverse maximum autocorrelation
      g723_1: make scale_vector() behave like the reference
      g723_1: fix off-by-one error in normalize_bits()
      g723_1: save/restore excitation with offset to store LPC history
      wmapro: prevent division by zero when sample rate is unspecified
      x86: proresdsp: improve SIGNEXTEND macro comments
      x86: h264dsp: K&R formatting cosmetics
      LICENSE: Document all GPL files
    
    Conflicts:
    	libavcodec/g723_1.c
    	libavcodec/wmaprodec.c
    	libavcodec/x86/h264dsp_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a7acab6c
fmtconvert.asm 11.2 KB