1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavutil
Michael Niedermayer 7beadfe1f7 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>
2012-09-08 12:53:44 +02:00
..
2012-07-11 04:04:29 +02:00
2012-07-16 19:30:13 +00:00
2012-08-15 22:32:06 +03:00
2012-08-16 22:04:46 +02:00
2012-08-15 22:32:06 +03:00
2012-05-15 18:08:32 +02:00
2012-08-09 01:44:15 +02:00
2012-08-22 14:29:10 +01:00
2012-06-09 02:51:02 +02:00
2012-07-07 01:41:55 +00:00
2012-09-07 09:59:12 +02:00
2012-07-06 17:08:22 +02:00