Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Sep 2012 10:53:44 +0000 (12:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Sep 2012 10:53:44 +0000 (12:53 +0200)
commit7beadfe1f7777574e99fd4cf6bcd7abad4fb4089
tree48b177a5d395f894b8ad8b99086cecf4271aedb5
parent8a0118b4b49460fb2d33b3fac765c7131816ecc7
parent7b699d813681e4fad419ec63c96d595e98b2dbfa
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
libavcodec/cavsdec.c
libavcodec/cavsdsp.c
libavcodec/cavsdsp.h
libavcodec/x86/cavsdsp.c
libavcodec/x86/dnxhdenc.c
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_qns_template.c
libavcodec/x86/dsputil_rnd_template.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/lpc.c
libavcodec/x86/mpegaudiodec.c
libavformat/mov_chan.c
libavutil/x86/float_dsp.asm
libswscale/swscale.c
tests/fate/mpc.mak