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-15 15:55:24 +02:00
2012-08-31 15:39:03 +02:00
2012-08-14 15:34:39 +02:00
2012-09-08 12:53:44 +02:00
2012-08-31 13:34:32 +02:00
2012-08-07 23:04:55 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-08-09 19:31:56 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-08-31 13:34:32 +02:00
2012-09-08 12:53:44 +02:00
2012-08-13 14:38:43 +02:00
2012-08-09 19:31:56 +02:00
2012-08-29 18:04:34 +02:00
2012-09-01 10:59:16 +02:00
2012-08-31 13:34:32 +02:00
2012-08-03 23:13:06 +02:00
2012-08-31 13:01:30 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 01:53:25 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 15:39:03 +02:00
2012-08-31 15:39:03 +02:00
2012-08-14 15:34:39 +02:00
2012-08-31 13:34:32 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 13:34:32 +02:00
2012-09-01 10:59:16 +02:00
2012-08-07 23:04:55 +02:00
2012-08-07 15:20:56 +01:00
2012-08-31 13:34:32 +02:00
2012-08-07 15:20:56 +01:00
2012-08-07 23:04:55 +02:00
2012-09-04 17:04:51 +02:00
2012-08-16 16:20:30 +02:00
2012-08-09 19:31:56 +02:00
2012-08-16 17:26:06 +02:00
2012-08-31 15:39:03 +02:00
2012-09-08 12:53:44 +02:00
2012-08-29 18:13:00 +02:00
2012-08-09 19:31:56 +02:00
2012-08-16 17:28:13 +02:00
2012-08-29 18:04:34 +02:00
2012-09-08 12:53:44 +02:00
2012-08-24 14:30:40 +02:00
2012-08-29 18:13:00 +02:00
2012-08-31 13:34:32 +02:00
2012-08-16 16:20:30 +02:00
2012-08-08 15:45:09 +02:00
2012-09-01 10:59:16 +02:00
2012-08-31 15:39:03 +02:00
2012-08-30 18:50:33 +02:00
2012-08-07 15:21:20 +01:00
2012-08-31 13:01:30 +02:00
2012-08-07 15:21:20 +01:00
2012-08-29 18:04:34 +02:00
2012-08-29 18:04:34 +02:00
2012-09-01 10:59:16 +02:00
2012-08-31 15:39:03 +02:00
2012-08-31 13:01:30 +02:00
2012-08-13 14:38:43 +02:00
2012-08-04 23:51:43 +02:00
2012-08-31 13:01:30 +02:00
2012-08-07 23:04:55 +02:00
2012-09-06 16:23:17 +02:00
2012-08-09 19:31:56 +02:00
2012-08-07 23:04:55 +02:00
7beadfe1f7