• 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
Name
Last commit
Last update
..
fate Loading commit data...
ref Loading commit data...
Makefile Loading commit data...
asynth1.sw Loading commit data...
audiogen.c Loading commit data...
base64.c Loading commit data...
copycooker.sh Loading commit data...
fate-run.sh Loading commit data...
fate-update.sh Loading commit data...
fate-valgrind.supp Loading commit data...
fate.sh Loading commit data...
fate_config.sh.template Loading commit data...
ffserver-regression.sh Loading commit data...
ffserver.conf Loading commit data...
ffserver.regression.ref Loading commit data...
lavf-regression.sh Loading commit data...
lavfi-regression.sh Loading commit data...
lena.pnm Loading commit data...
md5.sh Loading commit data...
regression-funcs.sh Loading commit data...
rotozoom.c Loading commit data...
tiny_psnr.c Loading commit data...
utils.c Loading commit data...
videogen.c Loading commit data...