Michael Niedermayer a01fe55077 Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f' ...

* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
  asyncts: merge two conditions
  x86inc: fully concatenate tokens to fix macro expansion for nasm
  h264: initialize frame-mt context copies properly

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

2012-12-14 15:43:46 +01:00

..

arm

Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

2012-12-08 14:58:56 +01:00

avr32

…

bfin

…

mips

mips: Fixing HAVE_MIPSFPU dependencies

2012-11-21 23:57:29 +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 commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'

2012-12-14 15:43:46 +01:00

adler32.c

…

adler32.h

…

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

…

audio_fifo.c

…

audio_fifo.h

…

audioconvert.h

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

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

avassert.h

av_assert should use AV_LOG_PANIC.

2012-12-05 20:25:32 +01:00

avstring.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

avstring.h

…

avutil.h

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

base64.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

base64.h

…

blowfish.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

blowfish.h

…

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

…

channel_layout.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

channel_layout.h

lavu/channel_layout: document the semantic of layouts.

2012-12-02 18:51:04 +01:00

colorspace.h

…

common.h

Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

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

cpu.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +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 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

crc.h

Merge remote-tracking branch 'qatar/master'

2012-11-16 13:23:35 +01:00

des.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

des.h

…

dict.c

…

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 '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +01:00

eval.h

lavu: remove disabled FF_API_OLD_EVAL_NAMES code

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

fifo.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

fifo.h

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

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

file.c

Merge remote-tracking branch 'qatar/master'

2012-11-30 14:55:12 +01:00

file.h

file: typo

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

float_dsp.c

Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +01:00

float_dsp.h

Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +01:00

imgutils.c

lavu/imgutils: add consistency checks to av_image_copy_plane()

2012-11-25 18:19:59 +01:00

imgutils.h

lavu/imgutils: add consistency checks to av_image_copy_plane()

2012-11-25 18:19:59 +01:00

integer.c

…

integer.h

…

internal.h

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

intfloat_readwrite.c

…

intfloat_readwrite.h

…

intfloat.h

…

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

…

lls.h

…

log2_tab.c

Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'

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

log.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

log.h

opt: Add support to query ranges

2012-12-08 01:34:28 +01: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

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

md5.h

lavu: keep context size variables

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

mem.c

mem: minor simplification of the alignment hack code

2012-12-14 05:36:22 +01: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

opt: fix memleak on error of range_array

2012-12-11 00:03:23 +01:00

opt.h

opt: Add support to query ranges

2012-12-08 01:34:28 +01:00

parseutils.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

parseutils.h

lavu/parseutils: accept %J for hours >= 24.

2012-12-02 11:48:56 +01:00

pca.c

pca: get rid of VLA

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

pca.h

…

pixdesc.c

pixdesc: fix yuva 10bit bit depth

2012-12-05 17:52:55 +01:00

pixdesc.h

pixdesc: add av_get_padded_bits_per_pixel()

2012-11-21 17:05:50 +01:00

pixfmt.h

Merge remote-tracking branch 'qatar/master'

2012-10-30 17:47:36 +01:00

qsort.h

…

random_seed.c

Merge commit '0a75d1da23b8659ec49391469bb592da12760077'

2012-10-12 14:15:33 +02:00

random_seed.h

…

rational.c

replace av_log(0, by av_log(NULL,

2012-11-23 18:10:02 +01:00

rational.h

…

rc4.c

…

rc4.h

…

samplefmt.c

lavu/samplefmt: return the size of the allocated samples buffer at the next bump

2012-11-25 23:23:24 +01:00

samplefmt.h

lavu/samplefmt: return the size of the allocated samples buffer at the next bump

2012-11-25 23:23:24 +01:00

sha.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

sha.h

lavu: keep context size variables

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

softfloat.c

…

softfloat.h

…

time.c

…

time.h

…

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

…

timestamp.h

…

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

opt: Add support to query ranges

2012-12-08 01:34:28 +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

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

xtea.h

…