Michael Niedermayer b0387edd5e Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' ...

* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-05-30 01:40:54 +02:00

..

arm

Merge remote-tracking branch 'qatar/master'

2012-05-07 22:51:34 +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

Merge remote-tracking branch 'qatar/master'

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

ppc

Merge remote-tracking branch 'qatar/master'

2012-04-13 21:50:37 +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

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02: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

avutil: add av_noreturn

2011-11-11 04:24:00 +01: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-04-09 23:02:33 +02:00

audioconvert.h

Merge remote-tracking branch 'qatar/master'

2012-04-09 23:02:33 +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

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +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

lavu/bprint: add av_bprint_reset().

2012-05-14 19:11:39 +02:00

bprint.h

lavu/bprint: add av_bprint_reset().

2012-05-14 19:11:39 +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

cmdutils/avutil: Move cpu caps parse code into av_parse_cpu_caps()

2012-04-30 18:31:06 +02:00

cpu.h

libavutil: Document the shortcommings of av_parse_cpu_flags()

2012-04-30 18:31:06 +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

des: Fix half a dozen warnings

2012-04-02 21:23:56 +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

error: Try to make av_strerror() closer to binary identical across platforms.

2012-05-09 11:26:11 +02:00

error.h

lavu/error: fix make checkheaders.

2012-05-18 23:34:11 +02:00

eval.c

The lt and lte functions were swapped.

2012-04-01 11:01:08 +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-01-28 07:53:34 +01:00

file.h

av_tempfile: Pass int log_offset, void *log_ctx

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

imgutils.c

av_image_alloc: Align the width to 8 when align >= 8.

2012-04-13 18:40:17 +02:00

imgutils.h

Merge remote-tracking branch 'qatar/master'

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

integer.c

avutil: Remove unused arbitrary precision integer code.

2011-06-28 13:14:46 +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'

2011-12-13 00:39:48 +01: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

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

libm.h

Check for cbrtf() and provide fallback

2011-10-22 19:49:27 +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

Merge remote-tracking branch 'qatar/master'

2012-05-28 00:50:23 +02:00

log.h

lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect

2012-02-06 11:30:54 +01: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

Merge remote-tracking branch 'qatar/master'

2012-05-07 22:51:34 +02:00

mathematics.c

Merge remote-tracking branch 'qatar/master'

2012-02-21 05:10:12 +01:00

mathematics.h

Merge remote-tracking branch 'qatar/master'

2012-02-21 05:10:12 +01:00

md5.c

Merge remote-tracking branch 'qatar/master'

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

md5.h

Merge remote-tracking branch 'qatar/master'

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

mem.c

mem.c: fix wrong comment.

2012-04-16 22:13:12 +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-05-28 22:07:34 +02:00

opt.h

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

parseutils.c

parseutils: use strings instead of integers for error codes.

2012-05-09 02:53:42 +02: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

Add yuva422p pix_fmt.

2012-05-08 08:39:37 +02:00

pixdesc.h

pixdesc: put components always in the same order.

2012-03-21 19:01:39 +01:00

pixfmt.h

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

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

random_seed.c

random_seed: add selftest

2012-02-23 23:44:38 +01: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

timecode.c

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

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

timecode.h

lavu: add public timecode API.

2012-02-02 14:30:28 +01:00

timer.h

Merge remote-tracking branch 'qatar/master'

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

timestamp.h

lavu: add timestamp.h header with convenience timestamp utilities

2012-02-09 18:37:58 +01: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

x86_cpu.h

Replace FFmpeg with Libav in licence headers

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