1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavutil
Michael Niedermayer 4cf4da9dc5 Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'
* commit '5b4797a21db900b7d509660b7a4d49829089b004':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05 22:12:41 +01:00
..
arm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
avr32
bfin
mips mips: optimization for float aac decoder (sbr module) 2013-02-21 22:43:08 +01:00
ppc Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf' 2013-08-29 14:24:07 +02:00
sh4
tomi Merge remote-tracking branch 'qatar/master' 2013-02-20 12:04:50 +01:00
x86 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
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 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 remote-tracking branch 'qatar/master' 2013-12-20 13:16:56 +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 Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_fifo.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00: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 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 base64-test: Remove posibility of returning restricted exit codes 2013-10-25 11:06:32 +01:00
base64.h lavu/base64: extend/clarify doxy for the base64 API 2013-01-02 23:52:35 +01:00
blowfish.c Merge remote-tracking branch 'qatar/master' 2013-09-11 12:51:01 +02:00
blowfish.h
bprint.c lavu/bprint: add append buffer function 2013-08-30 22:36:38 +02:00
bprint.h lavu/bprint: add append buffer function 2013-08-30 22:36:38 +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 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 '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e' 2013-08-29 14:15:10 +02:00
cpu.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
cpu.h Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4' 2013-10-26 02:36:36 +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 remote-tracking branch 'qatar/master' 2013-09-11 12:51:01 +02:00
des.h
dict.c lavu/dict: cosmetic realign. 2013-04-13 23:48:26 +02:00
dict.h lavu/dict.h: extend/clarify av_dict_get() doxy 2013-12-16 18:30:04 +01:00
error.c Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4' 2012-10-22 14:39:12 +02:00
error.h error.h: Do not circularly depend on avutil.h 2013-12-25 00:12:05 +01:00
eval.c Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df' 2013-07-28 13:37:46 +02: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 avutil/fifo: assert that theres enough data in the fifo on drain calls. 2013-09-03 03:11:35 +02:00
fifo.h Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714' 2012-10-23 15:00:27 +02:00
file_open.c avutil: add av_fopen_utf8() 2013-11-04 15:38:52 +01:00
file.c Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa' 2013-08-10 10:37:20 +02:00
file.h cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
float_dsp.c Merge remote-tracking branch 'qatar/master' 2013-09-11 12:51:01 +02:00
float_dsp.h floatdsp: restrict->av_restrict 2013-01-24 00:49:47 +01:00
frame.c avutil/frame: increase padding for frames 2013-12-28 19:10:45 +01:00
frame.h Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' 2014-01-05 22:12:41 +01: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 avutil/hmac: make const tables static const 2013-08-06 20:30:55 +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 Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654' 2013-12-09 20:52:14 +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 Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
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 Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f' 2012-10-23 13:34:42 +02:00
libm.h libm: Add fallback definition for cbrt() using pow() 2013-01-22 16:02:31 +01:00
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: skip IO calls on empty strings 2013-12-06 23:30:34 +01:00
log.h avutil/log: document log callback thread saftey requirements 2013-10-23 18:15:49 +02: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
macros.h Merge remote-tracking branch 'qatar/master' 2013-12-30 11:23:32 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-12-30 11:23:32 +01:00
mathematics.c avutil/mathematics: add av_add_stable() 2014-01-04 15:10:09 +01:00
mathematics.h avutil/mathematics: add av_add_stable() 2014-01-04 15:10:09 +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 Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' 2013-11-14 15:04:04 +01:00
mem.h Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' 2013-11-14 15:04:04 +01: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 Merge remote-tracking branch 'qatar/master' 2013-11-14 03:26:35 +01:00
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 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 lavu,lavc,lswr: do not hardcode AV_SAMPLE_FMT_NB value when setting sample format max value 2013-12-26 11:35:27 +01:00
opt.h fix order of operations in comments 2013-10-23 14:32:04 +02: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: use av_calloc() 2013-04-15 20:31:06 +02:00
pca.h
pixdesc.c Convert XvMC to hwaccel v3 2013-12-22 22:03:47 +01:00
pixdesc.h Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f' 2013-10-03 21:29:38 +02:00
pixfmt.h Convert XvMC to hwaccel v3 2013-12-22 22:03:47 +01:00
qsort.h
random_seed.c Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21' 2013-08-08 11:18:17 +02:00
random_seed.h
rational.c avutil/rational: av_add_stable() test code 2014-01-04 15:10:14 +01:00
rational.h libavutil: cast truncated values to uint32_t 2013-08-27 14:25:34 +02:00
rc4.c
rc4.h
ripemd.c lavu/ripemd: Add a size optimized version of the transform functions 2013-09-09 11:18:48 +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 lavu/sha512: Fully unroll the transform function loops 2013-09-11 21:55:59 +02:00
sha512.h lavu: Add SHA-2 512 hashing 2013-06-02 11:27:19 +02:00
sha.c lavu/sha: Fully unroll the transform function loops 2013-09-11 21:55:59 +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
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 Merge remote-tracking branch 'qatar/master' 2013-09-11 12:51:01 +02:00
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 tree-test: Don't return restricted exit codes 2013-10-24 10:59:26 +01:00
tree.h Merge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986' 2013-08-01 10:41:06 +02:00
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 '5b4797a21db900b7d509660b7a4d49829089b004' 2014-01-05 22:12:41 +01:00
x86_cpu.h
xga_font_data.c
xga_font_data.h Mark data symbols shared between libraries with av_export 2012-10-20 01:56:50 +02:00
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