Michael Niedermayer 4ccb7911ba Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  ARM: silence some annoying armcc warnings
  ffplay: Remove unused-but-set channels variable from update_sample_display().
  build: Add DEP_LIBS dependency directly to the shared library build rule.
  build: Remove multiple inclusion guards from config.mak.
  build: Remove redundant config.mak includes from subdirectory Makefiles.
  aacenc: Mark psy_3gpp_window() as av_unused.

Conflicts:
	configure

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

2011-06-26 02:31:32 +02:00

..

arm

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +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 FFmpeg with Libav in licence headers

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

ppc

Merge remote branch 'qatar/master'

2011-05-13 04:40:40 +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 remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

adler32.c

Replace many includes of libavutil/common.h with what is actually needed

2010-03-09 17:39:19 +00:00

adler32.h

Replace FFmpeg with Libav in licence headers

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

aes.c

Replace FFmpeg with Libav in licence headers

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

aes.h

Replace FFmpeg with Libav in licence headers

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

attributes.h

Merge remote-tracking branch 'qatar/master'

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

audioconvert.c

Merge remote-tracking branch 'qatar/master'

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

audioconvert.h

Replace FFmpeg with Libav in licence headers

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

avassert.h

Merge remote-tracking branch 'qatar/master'

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

avstring.c

Replace FFmpeg with Libav in licence headers

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

avstring.h

Merge remote-tracking branch 'qatar/master'

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

avutil.h

Merge remote-tracking branch 'qatar/master'

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

base64.c

Replace FFmpeg with Libav in licence headers

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

base64.h

Replace FFmpeg with Libav in licence headers

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

bswap.h

bswap.h: Remove disabled code.

2011-04-29 20:01:04 +02:00

colorspace.h

Replace FFmpeg with Libav in licence headers

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

common.h

Merge remote-tracking branch 'qatar/master'

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

cpu.c

cpudetect: add av_force_cpu_flags()

2011-06-02 21:03:54 +02:00

cpu.h

cpudetect: add av_force_cpu_flags()

2011-06-02 21:03:54 +02:00

crc_data.h

Replace FFmpeg with Libav in licence headers

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

crc.c

Replace FFmpeg with Libav in licence headers

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

crc.h

Replace FFmpeg with Libav in licence headers

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

des.c

Merge remote-tracking branch 'qatar/master'

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

des.h

Merge remote-tracking branch 'qatar/master'

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

dict.c

Merge remote-tracking branch 'qatar/master'

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

dict.h

Merge remote-tracking branch 'qatar/master'

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

error.c

error.c: fix compile flags

2011-05-30 03:11:54 +02:00

error.h

error: remove symbols which were deprecated before the big bump

2011-04-22 10:21:21 +02:00

eval.c

eval: Fix 32bit unsigned parsing

2011-06-20 01:58:18 +02:00

eval.h

lavu: remove FF_API_OLD_EVAL_NAMES cruft

2011-04-19 19:03:44 +02:00

fifo.c

fifo: use av_freep()

2011-05-09 21:23:45 +02:00

fifo.h

Replace FFmpeg with Libav in licence headers

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

file.c

Fix error check in av_file_map()

2011-06-04 17:03:25 +01:00

file.h

Replace FFmpeg with Libav in licence headers

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

imgutils.c

Merge remote-tracking branch 'qatar/master'

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

imgutils.h

Merge remote-tracking branch 'qatar/master'

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

integer.c

Replace FFmpeg with Libav in licence headers

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

integer.h

Replace FFmpeg with Libav in licence headers

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

internal.h

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

intfloat_readwrite.c

Replace FFmpeg with Libav in licence headers

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

intfloat_readwrite.h

Replace FFmpeg with Libav in licence headers

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

intmath.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00: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

Replace FFmpeg with Libav in licence headers

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

lfg.h

Replace FFmpeg with Libav in licence headers

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

libavutil.v

Add symbol versioning for shared libraries

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

libm.h

Merge remote branch 'qatar/master'

2011-04-22 03:54:30 +02:00

lls.c

Replace FFmpeg with Libav in licence headers

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

lls.h

Replace FFmpeg with Libav in licence headers

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

log.c

Merge remote branch 'qatar/master'

2011-05-09 04:50:56 +02:00

log.h

Merge remote-tracking branch 'qatar/master'

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

lzo.c

Merge remote-tracking branch 'qatar/master'

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

lzo.h

Merge remote-tracking branch 'qatar/master'

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

Makefile

build: Remove redundant config.mak includes from subdirectory Makefiles.

2011-06-25 13:02:51 +02:00

mathematics.c

av_compare_ts: Improve speed when calculations fit in 64bit.

2011-05-11 20:41:19 +02:00

mathematics.h

Replace FFmpeg with Libav in licence headers

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

md5.c

Replace FFmpeg with Libav in licence headers

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

md5.h

Replace FFmpeg with Libav in licence headers

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

mem.c

mem: Trying to workaround posix_memalign() bug on OSX

2011-06-07 03:17:42 +02:00

mem.h

Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'

2011-05-01 00:26:05 +02:00

opt.c

opt: do not crash in av_set_options_string() if opts == NULL

2011-06-19 19:13:05 +02:00

opt.h

opt: do not crash in av_set_options_string() if opts == NULL

2011-06-19 19:13:05 +02:00

parseutils.c

Merge remote-tracking branch 'qatar/master'

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

parseutils.h

Merge remote-tracking branch 'qatar/master'

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

pca.c

Merge remote branch 'qatar/master'

2011-04-27 03:51:04 +02:00

pca.h

Replace FFmpeg with Libav in licence headers

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

pixdesc.c

Merge remote-tracking branch 'qatar/master'

2011-06-11 03:51:36 +02:00

pixdesc.h

pixdesc: remove duplicated header inclusion

2011-06-06 11:34:45 +02:00

pixfmt.h

Merge remote-tracking branch 'qatar/master'

2011-06-11 03:51:36 +02:00

random_seed.c

Merge remote branch 'qatar/master'

2011-04-21 03:37:05 +02:00

random_seed.h

Replace FFmpeg with Libav in licence headers

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

rational.c

Replace FFmpeg with Libav in licence headers

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

rational.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00: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

samplefmt: remove deprecated use of av_get_bits_per_sample_fmt()

2011-06-25 22:06:30 +02:00

samplefmt.h

Merge remote-tracking branch 'qatar/master'

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

sha.c

Merge remote branch 'qatar/master'

2011-04-21 03:37:05 +02:00

sha.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00: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

timer.h

Replace FFmpeg with Libav in licence headers

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

tree.c

Replace FFmpeg with Libav in licence headers

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

tree.h

Replace FFmpeg with Libav in licence headers

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

utils.c

Merge remote branch 'qatar/master'

2011-04-27 03:51:04 +02:00

x86_cpu.h

Replace FFmpeg with Libav in licence headers

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