Michael Niedermayer 3141b04c7f Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87' ...

* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
  bfin: Refactor duplicated assembly-related macros

Conflicts:
	libavcodec/bfin/hpel_pixels_bfin.S

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

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

..

aarch64

Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'

2014-02-20 23:13:13 +01: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: add ff_vector_{fmul_add, fmac_scalar}_fma3

2014-03-13 04:34:05 +01:00

adler32.c

…

adler32.h

…

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

…

audio_fifo.c

…

audio_fifo.h

…

audioconvert.h

…

avassert.h

…

avstring.c

avutil/avstring: fix () position

2013-12-11 21:13:51 +01:00

avstring.h

avutil/avstring: add av_strnlen()

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

avutil.h

Merge remote-tracking branch 'qatar/master'

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

avutilres.rc

…

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

…

channel_layout.h

Merge commit '5c437fb'

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

colorspace.h

…

common.h

…

cpu_internal.h

Merge commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217'

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

cpu.c

x86: add detection for Bit Manipulation Instruction sets

2014-02-23 15:29:36 +01:00

cpu.h

x86: add detection for Bit Manipulation Instruction sets

2014-02-23 15:29:36 +01:00

crc.c

…

crc.h

…

des.c

…

des.h

…

dict.c

Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

2014-03-07 12:44:09 +01:00

dict.h

Merge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'

2014-02-05 03:27:13 +01: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

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

…

file.c

…

file.h

…

float_dsp.c

…

float_dsp.h

Merge remote-tracking branch 'qatar/master'

2014-03-09 15:37:35 +01:00

frame.c

avutil/frame_copy_audio: also check that channels match

2014-02-24 10:12:33 +01:00

frame.h

Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'

2014-03-04 21:55:16 +01:00

hash.c

…

hash.h

…

hmac.c

…

hmac.h

…

imgutils.c

…

imgutils.h

…

integer.c

…

integer.h

…

internal.h

avutil/internal.h: add timer.h back

2014-01-26 02:23:26 +01: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

…

lls1.h

…

lls2.c

…

lls2.h

…

log2_tab.c

…

log.c

lavu/log: add device categories

2014-03-03 23:34:31 +01:00

log.h

lavu/log: add device categories

2014-03-03 23:34:31 +01:00

lzo.c

…

lzo.h

…

macros.h

Merge remote-tracking branch 'qatar/master'

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

Makefile

Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'

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

mathematics.c

avutil/mathematics: add av_add_stable()

2014-01-04 15:10:09 +01: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

…

mem.h

…

murmur3.c

…

murmur3.h

…

old_pix_fmts.h

…

opencl_internal.c

…

opencl_internal.h

…

opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

opencl.h

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

opt.c

avutil/opt: allow max=min=0 for pixel formats

2014-03-01 00:31:38 +01:00

opt.h

Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'

2014-02-20 02:01:13 +01:00

parseutils.c

Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

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

parseutils.h

…

pca.c

…

pca.h

…

pixdesc.c

avutil/pixdesc: set bayer pixfmt descriptor flags

2014-02-23 02:24:03 +01:00

pixdesc.h

…

pixfmt.h

Convert XvMC to hwaccel v3

2013-12-22 22:03:47 +01: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

…

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

…

utils.c

Merge remote-tracking branch 'qatar/master'

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

version.h

lavu/log: add device categories

2014-03-03 23:34:31 +01:00

x86_cpu.h

…

xga_font_data.c

…

xga_font_data.h

…

xtea.c

…

xtea.h

…