• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7beadfe1
    Michael Niedermayer authored
    * qatar/master:
      mov_chan: Only set the channel_layout if setting it to a nonzero value
      mov_chan: Reindent an incorrectly indented line
      mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
      x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
      x86: more specific checks for availability of required assembly capabilities
      x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
      fate: Drop redundant setting of FUZZ to 1
      cavsdsp: set idct permutation independently of dsputil
      x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
    
    Conflicts:
    	libavcodec/x86/dsputil_mmx.c
    	libavformat/mp3enc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7beadfe1
cavsdec.c 47 KB