Michael Niedermayer 5cf794e0c1 Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4' ...

* commit 'd82f188504410fdfa446c5682c128c31bb5851a4':
  Remove need for padding in av_memcpy_backptr()

Conflicts:
	libavutil/lzo.h

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

2012-10-24 14:10:44 +02:00

..

arm

Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

2012-10-12 14:26:46 +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

replace all __volatile__ by volatile

2012-07-11 04:04:29 +02:00

ppc

ppc/cpu: make linux 32bit specific altivec detection depend on __linux__

2012-09-24 13:41:48 +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 '9734b8ba56d05e970c353dfd5baafa43fdb08024'

2012-10-12 14:26:46 +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 commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

aes.h

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

attributes.h

lavu: disable av_uninit for clang

2012-07-16 19:30:13 +00:00

audio_fifo.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03: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-09-13 15:35:50 +02:00

audioconvert.h

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

avassert.h

Merge remote-tracking branch 'qatar/master'

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

avstring.c

Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

2012-10-13 16:39:42 +02:00

avstring.h

Merge remote-tracking branch 'qatar/master'

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

avutil.h

libavutil: loose idiotic circular dependancies between version and avutil.h

2012-10-13 18:47:18 +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

blowfish.c

Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'

2012-10-04 12:30:25 +02:00

blowfish.h

blowfish.h: include author attribution

2012-07-04 23:23:17 +02:00

bprint.c

bprint: Remove custom vsnprintf

2012-09-15 19:47:10 -04:00

bprint.h

lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values

2012-07-31 13:15:43 +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

Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

2012-10-21 13:35:42 +02:00

cpu.c

Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'

2012-09-05 14:09:09 +02:00

cpu.h

cpu: improve av_get_cpu_flags() doxy

2012-10-01 16:41:37 +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

av_des_init: suppress warning about unused parameter

2012-09-19 21:57:58 +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'

2012-08-16 16:20:30 +02:00

dict.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

error.c

Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'

2012-10-22 14:39:12 +02:00

error.h

Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'

2012-10-22 14:39:12 +02:00

eval.c

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

2012-10-14 14:46:13 +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

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

file.c

av_tempfile: fix leak in error case

2012-10-11 17:09:57 +02:00

file.h

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +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

Merge remote-tracking branch 'qatar/master'

2012-10-14 15:11:34 +02:00

imgutils.h

Merge remote-tracking branch 'qatar/master'

2012-10-14 15:11:34 +02:00

integer.c

integer: switch to av_assert

2012-08-09 01:44:15 +02:00

integer.h

avutil: Remove unused arbitrary precision integer code.

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

internal.h

Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'

2012-10-19 13:29:24 +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

intfloat: Don't use designated initializers in the public headers

2012-07-02 14:05:40 +03:00

intmath.h

Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

2012-10-21 16:13:55 +02:00

intreadwrite.h

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

2012-10-24 14:01:36 +02:00

lfg.c

avformat: Remove non-compiling and/or silly commented-out printf/av_log statements

2012-10-01 10:24:28 +02:00

lfg.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

libavutil.v

Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'

2012-10-23 13:34:42 +02:00

libm.h

Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

2012-10-24 12:53:26 +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

log2_tab.c

Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'

2012-10-13 14:24:58 +02:00

log2.c

Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

2012-10-21 13:35:42 +02:00

log.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

log.h

lavu: 256 color support

2012-07-07 01:41:55 +00:00

lzo.c

Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'

2012-10-24 14:10:44 +02:00

lzo.h

Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'

2012-10-24 14:10:44 +02:00

Makefile

Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'

2012-10-23 13:34:42 +02:00

mathematics.c

Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'

2012-10-13 14:35:42 +02:00

mathematics.h

Merge remote-tracking branch 'qatar/master'

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

md5.c

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

md5.h

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

mem.c

Merge remote-tracking branch 'qatar/master'

2012-10-20 13:18:59 +02:00

mem.h

Merge remote-tracking branch 'qatar/master'

2012-10-20 13:18:59 +02:00

old_pix_fmts.h

Merge commit '78071a1420b425dfb787ac739048f523007b8139'

2012-10-08 19:42:49 +02:00

opt.c

lavu: remove disabled avoptions cruft

2012-10-23 07:33:05 +02:00

opt.h

lavu: remove disabled avoptions cruft

2012-10-23 07:33:05 +02:00

parseutils.c

lavu/parseutils: remove unused gcd variable in av_parse_ratio()

2012-10-22 10:41:51 +02:00

parseutils.h

lavu/parseutils: add av_small_strptime()

2012-09-06 00:40:01 +02:00

pca.c

pca: get rid of VLA

2012-10-06 14:03:15 +02:00

pca.h

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

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

pixdesc.c

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

pixdesc.h

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

pixfmt.h

Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'

2012-10-13 14:14:11 +02:00

qsort.h

qsort: flip compare direction to match libc qsort()

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

random_seed.c

Merge commit '0a75d1da23b8659ec49391469bb592da12760077'

2012-10-12 14:15:33 +02: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'

2012-08-05 22:17:02 +02: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

lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

2012-10-23 07:33:05 +02:00

samplefmt.h

lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

2012-10-23 07:33:05 +02:00

sha.c

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

sha.h

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02: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: add av_timecode_check_frame_rate().

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

timecode.h

lavu/timecode: add av_timecode_check_frame_rate().

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

timer.h

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02: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 commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

tree.h

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

utils.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

version.h

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

x86_cpu.h

x86_cpu.h: newline at the end to shutup some warnings in opencc

2012-09-13 19:31:02 +02:00

xga_font_data.c

Move xGA font data from lavc to lavu.

2012-10-01 22:24:17 +02:00

xga_font_data.h

Mark data symbols shared between libraries with av_export

2012-10-20 01:56:50 +02:00

xtea.c

xtea: give constants the correct type

2012-10-08 03:44:18 +02:00

xtea.h

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00