Michael Niedermayer 83e8978798 Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78' ... * commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78': Add replaygain side data type and code for parsing replaygain tags. Conflicts: libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-24 14:03:55 +01:00
..
aarch64	Merge remote-tracking branch 'qatar/master'	2014-03-19 02:52:08 +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	Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.	2014-03-18 23:39:30 +01:00
adler32.c	avutil/adler32: add Doxy group	2013-11-03 00:58:31 +01:00
adler32.h	avutil/adler32: add Doxy group	2013-11-03 00:58:31 +01: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: 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	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	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
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	Do not leave positive values undefined when negative are defined as error	2013-10-19 16:42:57 +02:00
fifo.c
fifo.h
file_open.c	avutil: add av_fopen_utf8()	2013-11-04 15:38:52 +01:00
file.c
file.h
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_copy_audio: also check that channels match	2014-02-24 10:12:33 +01:00
frame.h	Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'	2014-03-24 14:03:55 +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	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	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 '5a7e35dd2351c30bab45177b9482cb8833a0ca78'	2014-03-24 14:03:55 +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	avutil/mem: avoid using intptr_t to access void* in av_dynarray_add()	2014-03-22 21:14:57 +01:00
mem.h	Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'	2013-11-14 15:04:04 +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	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	lavu/parseutils: add av_get_known_color_name()	2013-10-27 09:16:05 +01:00
pca.c
pca.h
pixdesc.c	Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'	2014-03-17 14:41:13 +01:00
pixdesc.h	Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'	2013-10-03 21:29:38 +02:00
pixfmt.h	Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'	2014-03-17 14:41:13 +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
replaygain.h	Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'	2014-03-24 14:03:55 +01: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 c708b54033	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-test: Don't return restricted exit codes	2013-10-24 10:59:26 +01:00
tree.h
utf8.c	avutil/utf8: put under #ifdef TEST	2013-11-22 17:16:11 +01:00
utils.c	Merge remote-tracking branch 'qatar/master'	2013-12-30 11:23:32 +01:00
version.h	Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'	2014-03-24 14:03:55 +01:00
x86_cpu.h
xga_font_data.c
xga_font_data.h
xtea.c	avutil/xtea: add Doxy @file and group	2013-11-03 00:59:38 +01:00
xtea.h	avutil/xtea: add Doxy @file and group	2013-11-03 00:59:38 +01:00