FFmpeg/libavformat
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-08-30 05:17:24 +02:00
2012-08-14 16:54:25 +02:00
2012-08-18 17:45:58 +02:00
2012-09-08 02:28:20 +02:00
2012-08-07 23:57:21 +02:00
2012-08-31 23:27:27 +02:00
2012-08-18 05:02:58 +02:00
2012-08-21 01:52:55 +02:00
2012-08-14 16:54:25 +02:00
2012-08-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-08-27 05:23:42 +02:00
2012-08-26 22:15:20 +02:00
2012-08-26 22:15:21 +02:00
2012-07-20 11:16:52 +02:00
2012-09-06 04:42:43 +02:00
2012-09-01 23:45:32 +02:00
2012-08-07 23:57:21 +02:00
2012-09-03 22:40:41 +02:00
2012-08-28 22:29:20 +02:00
2012-07-25 20:31:16 +03:00
2012-08-29 00:28:07 +02:00
2012-08-29 00:05:03 +02:00
2012-08-07 23:57:21 +02:00