1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavutil
Michael Niedermayer a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 09:16:36 +02:00
..
arm Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da' 2013-07-19 10:56:10 +02:00
avr32
bfin
mips mips: optimization for float aac decoder (sbr module) 2013-02-21 22:43:08 +01:00
ppc Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
sh4
tomi Merge remote-tracking branch 'qatar/master' 2013-02-20 12:04:50 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
adler32.c
adler32.h lavu/adler32: Fix doxy group definition, take two 2013-06-16 12:50:00 +02: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
atomic_gcc.h Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51' 2013-03-12 21:39:38 +01:00
atomic_suncc.h atomic: Add include guards to the implementation headers 2013-03-08 20:54:40 +01:00
atomic_win32.h atomic: Add include guards to the implementation headers 2013-03-08 20:54:40 +01:00
atomic.c Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65' 2013-04-03 14:46:48 +02:00
atomic.h Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65' 2013-04-03 14:46:48 +02:00
attributes.h
audio_fifo.c
audio_fifo.h Make audio FIFO read/write contracts more strict 2013-03-23 13:33:45 +01:00
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 '4be368b504c6f4a03051448728fc62cd0ed506b2' 2013-03-08 15:37:21 +01:00
avstring.h Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830' 2013-03-08 14:57:41 +01:00
avutil.h Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2' 2013-05-18 11:17:52 +02:00
base64.c lavu/base64: return meaningful error code. 2013-01-05 15:40:40 +01:00
base64.h lavu/base64: extend/clarify doxy for the base64 API 2013-01-02 23:52:35 +01:00
blowfish.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
blowfish.h
bprint.c lavu: add escape API 2013-03-07 01:12:04 +01:00
bprint.h avutil/bprint: Fix doxygen comments 2013-05-24 15:36:54 +02:00
bswap.h
buffer_internal.h avutil/buffer: Fix race in pool. 2013-03-18 19:19:22 +01:00
buffer.c lavu: define FF_MEMORY_POISON and use it 2013-05-13 13:52:26 +02:00
buffer.h Merge remote-tracking branch 'qatar/master' 2013-05-01 18:33:30 +02:00
channel_layout.c Call the common 7.1 wide channel layout "7.1(wide)". 2013-02-09 18:14:46 +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 lavu/common: make FF_CEIL_RSHIFT faster when shift is constant. 2013-05-13 17:53:16 +02:00
cpu.c Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 2013-06-03 11:53:05 +02:00
cpu.h Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675' 2013-05-24 13:24:28 +02:00
crc.c add crc24 tables 2013-07-10 12:07:53 +00:00
crc.h add crc24 tables 2013-07-10 12:07:53 +00:00
des.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
des.h
dict.c lavu/dict: cosmetic realign. 2013-04-13 23:48:26 +02:00
dict.h Merge commit '38c1466ca41c73c7ce347da702362cb69c151716' 2013-01-26 13:34:30 +01:00
error.c
error.h
eval.c Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df' 2013-07-28 13:37:46 +02:00
eval.h lavu: remove disabled FF_API_OLD_EVAL_NAMES code 2012-11-07 23:18:05 +01:00
fifo.c Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e' 2013-07-07 11:26:28 +02:00
fifo.h
file.c Merge remote-tracking branch 'qatar/master' 2012-11-30 14:55:12 +01:00
file.h cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
float_dsp.c Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511' 2013-05-05 12:53:50 +02:00
float_dsp.h floatdsp: restrict->av_restrict 2013-01-24 00:49:47 +01:00
frame.c Merge remote-tracking branch 'qatar/master' 2013-08-01 13:59:50 +02:00
frame.h Merge remote-tracking branch 'qatar/master' 2013-08-01 13:59:50 +02:00
hash.c lavu/hash: Add support for RIPEMD 2013-06-16 12:49:39 +02:00
hash.h lavu/hash: Add support for SHA-2 512 2013-06-15 18:49:12 -03:00
hmac.c fate: Add test vectors for HMAC SHA and SHA-2 2013-06-12 01:48:23 +02:00
hmac.h lavu/hmac: Add support for SHA-2 2013-06-12 01:47:42 +02:00
imgutils.c replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +02: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 lavu: define FF_MEMORY_POISON and use it 2013-05-13 13:52:26 +02:00
intfloat_readwrite.c avutil/intfloat_readwrite: include common.h for isinf() 2013-04-17 23:22:22 +02:00
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 lavu/intreadwrite: add AV_[RW][BLN]48 2013-02-13 15:35:54 +00:00
lfg.c
lfg.h
libavutil.v
libm.h libm: Add fallback definition for cbrt() using pow() 2013-01-22 16:02:31 +01:00
lls.c Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053' 2013-06-30 11:35:52 +02:00
lls.h Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053' 2013-06-30 11:35:52 +02:00
log2_tab.c
log.c lavu/log: print prefix after \r. 2013-07-20 11:06:19 +02:00
log.h Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534' 2012-12-19 14:28:58 +01:00
lzo.c Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6' 2013-03-16 14:10:09 +01:00
lzo.h Merge remote-tracking branch 'qatar/master' 2012-10-25 13:15:58 +02:00
Makefile lavu: Add RIPEMD hashing 2013-06-15 18:54:01 -03:00
mathematics.c av_rescale: support passing MIN/MAX through 2013-01-03 00:02:22 +01:00
mathematics.h lavu/math: fix than/then typo, and add a comma. 2013-01-03 00:02:51 +01:00
md5.c avutil/md5: reindent after previous commits 2013-05-25 16:11:08 +02:00
md5.h lavu/md5: Add doxy 2013-06-15 02:22:39 +02:00
mem.c avutil/mem: simplify av_reallocp_array() by using av_realloc_f() 2013-06-05 14:40:31 +02:00
mem.h Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' 2013-06-05 11:19:16 +02:00
murmur3.c murmur3: fix memleak 2013-05-15 12:10:09 +02:00
murmur3.h Add 128 bit murmur3 hash function. 2013-05-13 21:42:37 +02:00
old_pix_fmts.h
opencl_internal.c lavu/opencl_internal: use av_opencl_errstr 2013-05-06 12:08:04 +02:00
opencl_internal.h lavu/opencl:add opencl set param function 2013-04-26 03:04:42 +02:00
opencl.c lavu/opencl: remove semi-colon from macro. 2013-05-24 12:01:02 +02:00
opencl.h lavu/opencl: add opencl public error API 2013-05-05 13:44:29 +02:00
opt.c Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b' 2013-08-01 12:30:30 +02:00
opt.h Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
parseutils.c Force using a 64bit intermediate when calculating calendar time with av_timegm(). 2013-03-08 02:42:33 +01:00
parseutils.h lavu/parseutils: remove spurious "]]" in date format specification 2013-02-22 23:45:31 +01:00
pca.c pca: use av_calloc() 2013-04-15 20:31:06 +02:00
pca.h
pixdesc.c Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents 2013-07-29 23:46:51 +02:00
pixdesc.h Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 2013-07-28 13:44:34 +02:00
pixfmt.h avutil/pixfmt: dont refer to deprecated PIX_FMT in the documentation 2013-07-30 12:32:05 +02:00
qsort.h
random_seed.c
random_seed.h
rational.c avutil/rational: avoid llrint() and rint() 2013-07-04 23:50:58 +02:00
rational.h
rc4.c
rc4.h
ripemd.c avutil/ripemd: adjust loop condition to silence CID1035716 2013-06-22 14:52:29 +02:00
ripemd.h lavu: Add RIPEMD hashing 2013-06-15 18:54:01 -03:00
samplefmt.c av_samples_alloc_array_and_samples: Fix sizeof type. 2013-04-21 00:26:17 +02:00
samplefmt.h lavu/samplefmt: add av_samples_alloc_array_and_pointers() 2013-03-31 18:00:44 +02:00
sha512.c avutil/sha512: Reshuffle Maj() operands 2013-06-02 13:18:16 +02:00
sha512.h lavu: Add SHA-2 512 hashing 2013-06-02 11:27:19 +02:00
sha.c avutil/sha: reorder Maj arguments 2013-06-02 18:51:09 +02:00
sha.h lavu: keep context size variables 2012-10-28 14:33:41 +01:00
softfloat.c avutil/softfloat: remove unneeded include assert.h 2013-07-19 18:56:33 +02:00
softfloat.h
time.c
time.h
timecode.c lavu/timecode: fix time code calculation for 60000/1001 drop frame 2013-01-24 21:06:24 +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 avutil/timestamp: remove "" 2013-06-13 14:57:00 +02:00
tree.c avutil/tree: fix memleaks 2013-08-01 11:29:12 +02:00
tree.h Merge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986' 2013-08-01 10:41:06 +02:00
utils.c lavu/utils: silence warnings about incompatible pointer types 2013-06-15 21:47:45 +00:00
version.h avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames 2013-07-17 01:15:31 +02:00
x86_cpu.h
xga_font_data.c
xga_font_data.h
xtea.c xtea: fix unused variable warning for config_small 2012-12-29 03:37:46 +01:00
xtea.h