Michael Niedermayer bc4b424dfa Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f' ...

* commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f':
  mathematics: K&R formatting cosmetics

Conflicts:
	libavutil/mathematics.c

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

2014-05-03 23:46:36 +02:00

..

aarch64

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

arm

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

2014-03-13 23:59:56 +01:00

avr32

…

bfin

Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

2014-03-14 01:56:25 +01:00

mips

…

ppc

…

sh4

…

tomi

…

x86

x86/float_dsp: remove duplicated code from vector_dmul_scalar

2014-04-19 14:21:51 +02:00

adler32.c

adler32: Fix doxy group definition

2014-04-07 01:31:02 +02:00

adler32.h

adler32: Fix doxy group definition

2014-04-07 01:31:02 +02:00

aes.c

Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'

2014-01-26 01:54:55 +01:00

aes.h

…

atomic_gcc.h

…

atomic_suncc.h

…

atomic_win32.h

…

atomic.c

Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'

2014-02-19 21:53:58 +01:00

atomic.h

Merge remote-tracking branch 'qatar/master'

2013-12-20 13:16:56 +01:00

attributes.h

Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'

2013-11-03 12:38:13 +01:00

audio_fifo.c

…

audio_fifo.h

…

audioconvert.h

…

avassert.h

…

avstring.c

avutil/avstring: do not lose ascii characters when decoding non utf-8 with av_utf8_decode()

2014-04-13 15:33:23 +02:00

avstring.h

avutil/avstring: add av_strnlen()

2013-12-22 22:25:15 +01:00

avutil.h

avutil/avutil.h: remove duplicate rational.h include

2014-04-23 00:58:15 +02:00

avutilres.rc

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

base64.c

Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'

2014-01-26 01:54:55 +01:00

base64.h

…

blowfish.c

…

blowfish.h

…

bprint.c

…

bprint.h

…

bswap.h

Merge remote-tracking branch 'qatar/master'

2014-01-15 05:23:03 +01:00

buffer_internal.h

…

buffer.c

Revert "lavu/buffer: add release function"

2014-03-06 03:23:40 +01:00

buffer.h

Revert "lavu/buffer: add release function"

2014-03-06 03:23:40 +01:00

channel_layout.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

channel_layout.h

Merge commit '5c437fb'

2014-01-05 21:55:58 +01:00

colorspace.h

…

common.h

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

cpu_internal.h

Merge commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217'

2014-01-15 14:42:49 +01:00

cpu.c

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

cpu.h

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

crc.c

Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'

2014-04-17 22:38:51 +02:00

crc.h

Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'

2014-04-17 22:38:51 +02:00

des.c

…

des.h

…

dict.c

dict: const pointers to dictionary where possible

2014-04-03 13:13:25 +02:00

dict.h

dict: const pointers to dictionary where possible

2014-04-03 13:13:25 +02:00

downmix_info.c

Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'

2014-02-16 02:05:29 +01:00

downmix_info.h

Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'

2014-02-16 02:05:29 +01:00

dynarray.h

avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD

2014-03-22 21:47:38 +01:00

error.c

…

error.h

error.h: Do not circularly depend on avutil.h

2013-12-25 00:12:05 +01:00

eval.c

Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'

2014-01-26 01:54:55 +01:00

eval.h

…

fifo.c

…

fifo.h

…

file_open.c

avutil: add av_fopen_utf8()

2013-11-04 15:38:52 +01:00

file.c

…

file.h

…

fixed_dsp.c

avutil/fixed_dsp: remove redundant cast

2014-04-01 17:57:30 +02:00

fixed_dsp.h

libavutil: Add fixed_dsp

2014-04-01 17:36:33 +02:00

float_dsp.c

Merge remote-tracking branch 'qatar/master'

2014-03-22 18:52:21 +01:00

float_dsp.h

Merge remote-tracking branch 'qatar/master'

2014-03-19 02:52:08 +01:00

frame.c

avutil/frame: use av_malloc(z)_array()

2014-04-15 13:51:48 +02:00

frame.h

avutil/frame: undeprecate AVFrame.motion_val API

2014-03-26 18:22:49 +01:00

hash.c

lavu/hash: add hash_final helpers.

2014-04-29 13:24:11 +02:00

hash.h

lavu/hash: add hash_final helpers.

2014-04-29 13:24:11 +02:00

hmac.c

…

hmac.h

…

imgutils.c

…

imgutils.h

…

integer.c

…

integer.h

…

internal.h

lavu: add LOCAL_ALIGNED_32

2014-04-25 06:12:51 +02:00

intfloat_readwrite.c

avutil: Remove deprecated intfloat_readwrite code

2013-12-16 17:51:00 +01:00

intfloat_readwrite.h

avutil: Remove deprecated intfloat_readwrite code

2013-12-16 17:51:00 +01:00

intfloat.h

…

intmath.c

…

intmath.h

…

intreadwrite.h

…

lfg.c

…

lfg.h

…

libavutil.v

…

libm.h

…

lls1.c

avutil: reintroduce lls1 as the 52 ABI needs it

2013-11-17 16:44:32 +01:00

lls1.h

avutil: reintroduce lls1 as the 52 ABI needs it

2013-11-17 16:44:32 +01:00

lls2.c

rename new lls code to lls2 to avoid conflict with the old which has a different ABI

2013-11-17 16:41:08 +01:00

lls2.h

rename new lls code to lls2 to avoid conflict with the old which has a different ABI

2013-11-17 16:41:08 +01:00

log2_tab.c

…

log.c

avutil/log: fix memleak from 669a09fb372fa58ff913ebc326cb64bb3e8e7928

2014-04-29 03:13:51 +02:00

log.h

Add AV_LOG_PRINT_LEVEL flag to include log severity in default log formatting.

2014-04-26 19:27:33 +02:00

lzo.c

…

lzo.h

…

macros.h

Merge remote-tracking branch 'qatar/master'

2013-12-30 11:23:32 +01:00

Makefile

Move av_find_best_pix_fmt_of_2() from avcodec to avutil

2014-04-30 23:14:05 +02:00

mathematics.c

Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

2014-05-03 23:46:36 +02:00

mathematics.h

Fix compilation with msvc/icl due to missing header and define.

2014-02-03 19:48:41 +01:00

md5.c

…

md5.h

…

mem.c

lavu/mem: add av_dynarray_add_nofree function

2014-03-29 09:48:48 +01:00

mem.h

lavu/mem: add av_dynarray_add_nofree function

2014-03-29 09:48:48 +01:00

murmur3.c

…

murmur3.h

…

old_pix_fmts.h

Merge remote-tracking branch 'qatar/master'

2013-11-14 03:26:35 +01:00

opencl_internal.c

…

opencl_internal.h

…

opencl.c

opencl: add support for non-pthread locking

2014-05-01 19:28:31 +02:00

opencl.h

opencl: add support for non-pthread locking

2014-05-01 19:28:31 +02:00

opt.c

lavu/opt: add av_opt_set_dict2() function

2014-05-02 18:04:05 +02:00

opt.h

lavu/opt: add av_opt_set_dict2() function

2014-05-02 18:04:05 +02:00

parseutils.c

Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

2013-12-12 19:12:33 +01:00

parseutils.h

…

pca.c

…

pca.h

…

pixdesc.c

Move av_find_best_pix_fmt_of_2() from avcodec to avutil

2014-04-30 23:14:05 +02:00

pixdesc.h

Move av_find_best_pix_fmt_of_2() from avcodec to avutil

2014-04-30 23:14:05 +02:00

pixfmt.h

Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'

2014-04-09 03:07:47 +02:00

qsort.h

…

random_seed.c

Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'

2014-01-06 22:12:29 +01:00

random_seed.h

…

rational.c

avutil/rational: av_add_stable() test code

2014-01-04 15:10:14 +01:00

rational.h

lavu/rational: add syntactic sugar.

2014-01-19 17:12:22 +01:00

rc4.c

…

rc4.h

…

replaygain.h

Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'

2014-04-04 22:52:12 +02:00

ripemd.c

…

ripemd.h

…

samplefmt.c

Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'

2014-02-05 01:30:24 +01:00

samplefmt.h

…

sha512.c

…

sha512.h

…

sha.c

…

sha.h

…

softfloat.c

…

softfloat.h

…

stereo3d.c

Merge commit '7e244c68600f479270e979258e389ed5240885fb'

2013-12-09 21:33:51 +01:00

stereo3d.h

Merge remote-tracking branch 'qatar/master'

2013-12-17 19:37:50 +01:00

time.c

…

time.h

…

timecode.c

…

timecode.h

…

timer.h

avutil/timer: Fix units for x86 after c708b5403346255ea5adc776645616cc7c61f078

2014-03-09 15:22:02 +01:00

timestamp.h

avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use

2014-03-13 17:32:15 +01:00

tree.c

…

tree.h

…

utf8.c

avutil/utf8: put under #ifdef TEST

2013-11-22 17:16:11 +01:00

utils.c

avutil: Add av_get_time_base_q()

2014-04-22 16:38:33 -04:00

version.h

lavu/opt: add av_opt_set_dict2() function

2014-05-02 18:04:05 +02:00

x86_cpu.h

…

xga_font_data.c

…

xga_font_data.h

…

xtea.c

xtea: Add Doxy @file and group

2014-04-07 01:31:36 +02:00

xtea.h

xtea: Add Doxy @file and group

2014-04-07 01:31:36 +02:00