1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer 5eb353e0cd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  opt/eval: Include mathematics.h for NAN/INFINITY
  mathematics: Don't use division by zero in NAN/INFINITY macros
  wma: Lower the maximum number of channels to 2
  x86: cpu: clean up check for cpuid instruction support
  ARM: generate position independent code to access data symbols

Conflicts:
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-01 22:43:09 +02:00
..
2012-06-29 20:22:04 +02:00
2012-06-29 20:20:02 +02:00
2012-06-18 21:44:22 +02:00
2012-06-29 20:22:04 +02:00
2012-06-22 22:47:33 +00:00
2012-06-25 23:10:45 +02:00
2012-06-18 21:44:48 +02:00
2012-07-01 18:04:08 +02:00
2012-06-28 00:07:10 +02:00
2012-06-28 00:07:22 +02:00
2012-06-29 20:22:04 +02:00
2012-06-20 18:19:53 +02:00
2012-06-24 20:20:23 +02:00
2012-06-19 21:38:18 +02:00
2012-06-17 17:09:34 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-24 20:18:00 +02:00
2012-06-29 20:22:04 +02:00
2012-06-19 17:13:45 +02:00
2012-06-29 20:21:28 +02:00
2012-06-21 01:30:16 +00:00
2012-06-23 21:12:29 +02:00
2012-06-23 21:12:29 +02:00
2012-06-22 17:23:09 +02:00
2012-06-22 17:23:09 +02:00
2012-06-26 00:38:05 +02:00
2012-06-29 20:22:04 +02:00
2012-06-21 01:23:15 +00:00
2012-06-17 19:50:58 +02:00
2012-06-29 20:43:30 +02:00