Michael Niedermayer 494945cb66 Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480' ...

* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
	libavcodec/imgconvert.c

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

2012-11-21 15:37:01 +01:00

..

arm

Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

2012-10-12 14:26:46 +02:00

avr32

…

bfin

…

mips

mips: Optimization of AC3 FP encoder and EAC3 FP decoder

2012-11-19 22:24:44 +01:00

ppc

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

2012-09-24 13:41:48 +02:00

sh4

…

tomi

…

x86

Merge remote-tracking branch 'qatar/master'

2012-11-19 14:24:20 +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

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

aes.h

lavu: keep context size variables

2012-10-28 14:33:41 +01: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.h

lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

2012-11-11 13:35:12 -05:00

avassert.h

…

avstring.c

avstring: fix compiler warning about freeing const pointers

2012-11-03 20:22:53 +01:00

avstring.h

Merge remote-tracking branch 'qatar/master'

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

avutil.h

Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'

2012-10-30 14:40:22 +01: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

lavu/bprint: implement av_bprint_strftime().

2012-11-17 19:47:56 +01:00

bprint.h

lavu/bprint: implement av_bprint_strftime().

2012-11-17 19:47:56 +01:00

bswap.h

Merge remote-tracking branch 'qatar/master'

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

channel_layout.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

channel_layout.h

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

colorspace.h

…

common.h

Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

2012-11-15 11:12:25 +01:00

cpu.c

cpu: add a few cpu names as aliases for their cpu flags

2012-11-17 02:09:56 +01:00

cpu.h

cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52

2012-11-16 15:04:48 +01:00

crc_data.h

…

crc.c

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

2012-11-03 14:24:11 +01:00

crc.h

Merge remote-tracking branch 'qatar/master'

2012-11-16 13:23:35 +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

lavu: remove disabled FF_API_OLD_EVAL_NAMES code

2012-11-07 23:18:05 +01:00

eval.h

lavu: remove disabled FF_API_OLD_EVAL_NAMES code

2012-11-07 23:18:05 +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

file: typo

2012-10-31 17:01:52 +01:00

float_dsp.c

mips: Optimization of AC3 FP encoder and EAC3 FP decoder

2012-11-19 22:24:44 +01:00

float_dsp.h

mips: Optimization of AC3 FP encoder and EAC3 FP decoder

2012-11-19 22:24:44 +01:00

imgutils.c

av_image_copy: check for av_image_get_linesize() failure.

2012-10-31 19:12:48 +01: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

…

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.c

Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

2012-11-05 22:51:20 +01:00

intmath.h

Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

2012-11-05 22:51:20 +01: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

…

log2_tab.c

Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'

2012-10-13 14:24:58 +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 remote-tracking branch 'qatar/master'

2012-10-25 13:15:58 +02:00

lzo.h

Merge remote-tracking branch 'qatar/master'

2012-10-25 13:15:58 +02:00

Makefile

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

mathematics.c

lavu: add av_rescale_delta()

2012-10-27 00:26:35 +02:00

mathematics.h

lavu: add more doxy to av_rescale_delta

2012-10-27 02:58:09 +02:00

md5.c

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

md5.h

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

mem.c

Merge remote-tracking branch 'qatar/master'

2012-10-25 13:15:58 +02:00

mem.h

Merge remote-tracking branch 'qatar/master'

2012-10-25 13:15:58 +02:00

old_pix_fmts.h

Merge commit '78071a1420b425dfb787ac739048f523007b8139'

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

opt.c

lavu/opt: fix av_opt_get_key_value() API.

2012-11-16 10:36:45 +01:00

opt.h

lavu/opt: fix av_opt_get_key_value() API.

2012-11-16 10:36:45 +01:00

parseutils.c

lavu/parseutils: add trailing characters check in av_parse_video_size()

2012-10-29 17:39:26 +01: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

…

pixdesc.c

Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'

2012-11-21 15:37:01 +01:00

pixdesc.h

Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'

2012-11-21 15:37:01 +01:00

pixfmt.h

Merge remote-tracking branch 'qatar/master'

2012-10-30 17:47:36 +01: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

rational: test add/sub too

2012-11-01 02:59:44 +01:00

rational.h

Merge remote-tracking branch 'qatar/master'

2012-08-05 22:17:02 +02:00

rc4.c

…

rc4.h

…

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

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

sha.h

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

softfloat.c

…

softfloat.h

…

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: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code

2012-11-04 18:10:39 +01:00

timecode.h

lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code

2012-11-04 18:10:39 +01: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

tree-test: fix printf() types

2012-10-31 03:10:35 +01:00

tree.h

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

utils.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

version.h

lavu/bprint: implement av_bprint_strftime().

2012-11-17 19:47:56 +01: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