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

..

arm

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

avr32

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

bfin

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

mips

Optimization of AMR NB and WB decoders for MIPS

2012-06-11 21:12:39 +02:00

ppc

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

sh4

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

tomi

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

x86

x86: cpu: clean up check for cpuid instruction support

2012-07-01 12:25:33 +01:00

adler32.c

adler32: add comment for the SIMD code

2012-02-04 20:27:02 +01:00

adler32.h

Merge remote-tracking branch 'qatar/master'

2011-11-23 04:02:17 +01:00

aes.c

Merge remote-tracking branch 'qatar/master'

2011-12-22 01:51:53 +01:00

aes.h

Merge remote-tracking branch 'qatar/master'

2011-11-23 04:02:17 +01:00

attributes.h

Merge remote-tracking branch 'qatar/master'

2012-06-30 22:44:18 +02:00

audio_fifo.c

avutil: add audio fifo buffer

2012-04-20 09:43:11 -04:00

audio_fifo.h

avutil: add audio fifo buffer

2012-04-20 09:43:11 -04:00

audioconvert.c

Merge remote-tracking branch 'qatar/master'

2012-06-10 21:34:15 +02:00

audioconvert.h

Merge remote-tracking branch 'qatar/master'

2012-06-18 20:07:00 +02:00

avassert.h

Merge remote-tracking branch 'qatar/master'

2011-05-22 04:53:19 +02:00

avstring.c

Merge remote-tracking branch 'qatar/master'

2011-11-07 03:01:43 +01:00

avstring.h

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

avutil.h

avutil: fix project name reference in doxy section

2012-06-29 11:33:38 +02:00

base64.c

base64: 10l endian fix.

2012-01-22 23:06:04 +01:00

base64.h

Merge remote-tracking branch 'qatar/master'

2011-11-23 04:02:17 +01:00

bprint.c

bprint: implement vsnprintf for win32.

2012-06-14 13:54:00 +02:00

bprint.h

bprint: add av_bprint_init_for_buffer().

2012-06-07 22:28:32 +02:00

bswap.h

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

colorspace.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

common.h

Fixed warnings about int64 to int32 conversion

2012-05-25 02:41:28 +02:00

cpu.c

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +02:00

cpu.h

cpu.h: include version.h for LIBAVUTIL_VERSION_MAJOR

2012-06-24 12:34:12 +02:00

crc_data.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

crc.c

Merge remote-tracking branch 'qatar/master'

2011-12-05 00:11:57 +01:00

crc.h

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

des.c

Merge remote-tracking branch 'qatar/master'

2012-06-20 20:47:46 +02:00

des.h

Merge remote-tracking branch 'qatar/master'

2011-09-21 21:25:43 +02:00

dict.c

Merge remote-tracking branch 'qatar/master'

2011-11-07 03:01:43 +01:00

dict.h

Merge remote-tracking branch 'qatar/master'

2012-03-20 00:03:19 +01:00

error.c

lavu/error: add av_make_error_string() and av_err2str() convenience utilities

2012-06-11 23:57:01 +02:00

error.h

lavu/error: add av_make_error_string() and av_err2str() convenience utilities

2012-06-11 23:57:01 +02:00

eval.c

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

eval.h

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

fifo.c

fifo: add av_fifo_grow()

2012-05-15 18:08:32 +02:00

fifo.h

fifo: add av_fifo_grow()

2012-05-15 18:08:32 +02:00

file.c

Merge remote-tracking branch 'qatar/master'

2012-06-22 22:34:02 +02:00

file.h

av_tempfile: Pass int log_offset, void *log_ctx

2011-10-16 21:51:28 +02:00

float_dsp.c

Merge remote-tracking branch 'qatar/master'

2012-06-19 20:53:27 +02:00

float_dsp.h

Merge remote-tracking branch 'qatar/master'

2012-06-19 20:53:27 +02:00

imgutils.c

lavu/imgutils: create misc functions for dealing with buffers

2012-06-26 13:12:12 +02:00

imgutils.h

lavu/imgutils: create misc functions for dealing with buffers

2012-06-26 13:12:12 +02:00

integer.c

libavutil/integer: use av_assert

2012-06-06 20:01:08 +02:00

integer.h

avutil: Remove unused arbitrary precision integer code.

2011-06-28 13:14:46 +02:00

internal.h

Merge remote-tracking branch 'qatar/master'

2012-06-25 16:55:31 +02:00

intfloat_readwrite.c

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

intfloat_readwrite.h

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

intfloat.h

lavu: replace int/float punning functions

2011-12-11 18:47:19 +00:00

intmath.h

Merge remote-tracking branch 'qatar/master'

2011-11-23 04:02:17 +01:00

intreadwrite.h

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +02:00

inverse.c

Merge remote-tracking branch 'qatar/master'

2011-06-08 05:25:28 +02:00

lfg.c

Merge remote-tracking branch 'qatar/master'

2012-04-04 21:17:52 +02:00

lfg.h

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

libavutil.v

libavutil.v: add avpriv prefix

2012-06-09 02:51:02 +02:00

libm.h

Merge remote-tracking branch 'qatar/master'

2012-06-28 01:08:52 +02:00

lls.c

Merge remote-tracking branch 'qatar/master'

2011-07-12 01:42:32 +02:00

lls.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

log.c

log: change color for filters from blue to bright green

2012-06-28 00:36:32 +02:00

log.h

avutil: add get_category() for the case where one AVClass can have more than 1 category

2012-06-19 17:22:02 +02:00

lzo.c

libavutil: Remove broken and pointless lzo test program.

2012-03-26 13:00:09 +02:00

lzo.h

Avoid uninitialized data in lcldec when ofs is 0 in MSZH.

2011-12-31 16:31:15 +01:00

Makefile

lavu: split version info into version.h

2012-06-24 12:34:12 +02:00

mathematics.c

libavutil/mathematics: use av_assert()

2012-06-06 20:00:35 +02:00

mathematics.h

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

md5.c

md5: consistently use uint32_t instead of unsigned int

2012-06-16 12:47:46 +02:00

md5.h

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

mem.c

Merge remote-tracking branch 'qatar/master'

2012-06-19 20:53:27 +02:00

mem.h

mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece

2011-12-25 18:55:43 +01:00

opt.c

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

opt.h

opt: add AV_OPT_TYPE_PIXEL_FMT.

2012-06-07 22:13:59 +02:00

parseutils.c

parseutils: fix sorting of colors

2012-06-28 17:15:08 +00:00

parseutils.h

lavu/parseutils: fix specification for av_parse_time()

2012-05-18 00:38:06 +02:00

pca.c

Remove unused, never built libavutil/pca.[ch]

2011-06-29 23:49:03 +01:00

pca.h

Remove unused, never built libavutil/pca.[ch]

2011-06-29 23:49:03 +01:00

pixdesc.c

pixdesc: BGRA64 is rgb pixel format

2012-06-08 10:42:27 +00:00

pixdesc.h

pixdesc: fix project reference in comment

2012-06-29 11:23:56 +02:00

pixfmt.h

lavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.h

2012-05-24 00:42:31 +02:00

qsort.h

qsort: flip compare direction to match libc qsort()

2012-06-22 22:48:00 +02:00

random_seed.c

random_seed: Only read /dev/*random if we have unistd.h

2012-06-29 15:52:07 +03:00

random_seed.h

Merge remote-tracking branch 'qatar/master'

2011-11-23 04:02:17 +01:00

rational.c

libavutil: Remove pointless rational test program.

2012-03-26 13:00:09 +02:00

rational.h

Merge remote-tracking branch 'qatar/master'

2011-11-23 04:02:17 +01:00

rc4.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rc4.h

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

samplefmt.c

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

samplefmt.h

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

sha.c

Merge remote-tracking branch 'qatar/master'

2012-02-14 01:53:31 +01:00

sha.h

Merge remote-tracking branch 'qatar/master'

2011-11-23 04:02:17 +01:00

softfloat.c

Remove unused softfloat implementation.

2011-05-11 13:43:30 +02:00

softfloat.h

Remove unused softfloat implementation.

2011-05-11 13:43:30 +02:00

time.c

Merge remote-tracking branch 'qatar/master'

2012-06-22 22:34:02 +02:00

time.h

Merge remote-tracking branch 'qatar/master'

2012-06-22 22:34:02 +02:00

timecode.c

lavu/timecode: use @see for URL in doxygen.

2012-02-03 00:56:27 +01:00

timecode.h

timecode: move timecode muxer options to metadata.

2012-06-04 07:41:22 +02:00

timer.h

Merge remote-tracking branch 'qatar/master'

2012-01-06 02:45:12 +01:00

timestamp.h

lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE

2012-06-10 00:37:02 +02:00

tree.c

Merge remote-tracking branch 'qatar/master'

2011-12-05 00:11:57 +01:00

tree.h

lavu/tree: perform minor fixes to av_tree_insert() documentation

2012-05-20 16:19:36 +02:00

utils.c

libavutil: increase LIBAVUTIL_VERSION_MICRO to 100

2011-12-22 03:01:17 +01:00

version.h

lavu/imgutils: create misc functions for dealing with buffers

2012-06-26 13:12:12 +02:00

x86_cpu.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00