1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libavutil
Michael Niedermayer 151f88d507 Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'
* commit 'd816e125fe1fa5c909b706d47904a4d6c1799996':
  dict: const correctness for av_dict_get() and av_dict_copy()

Conflicts:
	libavutil/dict.c
	libavutil/dict.h

See: e12a73246d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-05 18:55:44 +02:00
..
aarch64 Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412' 2014-06-04 12:45:35 +02:00
arm Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412' 2014-06-04 12:45:35 +02:00
avr32
bfin Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00
mips
ppc avutil/ppc/intreadwrite: try to fix intreadwrite for ppc64le 2014-06-05 03:30:58 +02:00
sh4
tomi
x86 x86: hpeldsp: better factorization 2014-05-29 21:47:40 +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
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
attributes.h
audio_fifo.c avutil/audio_fifo: Use av_mallocz_array() 2014-05-05 18:59:56 +02:00
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.h avutil/avutil.h: remove duplicate rational.h include 2014-04-23 00:58:15 +02:00
avutilres.rc
base64.c
base64.h
blowfish.c
blowfish.h
bprint.c fix various typos 2014-06-03 10:58:19 -08:00
bprint.h
bswap.h
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
colorspace.h
common.h
cpu_internal.h
cpu.c avutil/cpu: force mmx on selection of higher x86 SIMD features 2014-05-20 06:10:59 +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 correctness for av_dict_get() and av_dict_copy() 2014-06-05 09:16:15 -07:00
dict.h Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996' 2014-06-05 18:55:44 +02:00
display.c avutil/display: use hypot(). 2014-05-23 23:30:21 +02:00
display.h Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834' 2014-05-19 19:12:30 +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
eval.c
eval.h
fifo.c lavu/fifo: add av_fifo_alloc_array function 2014-05-20 00:00:44 +02:00
fifo.h lavu/fifo: add av_fifo_alloc_array function 2014-05-20 00:00:44 +02:00
file_open.c avutil/file_open: Use av_mallocz_array() 2014-05-05 19:00:38 +02: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 Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88' 2014-06-01 13:18:32 +02:00
frame.h Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88' 2014-06-01 13:18:32 +02: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 Merge commit '4d8c28deab2488579f585406110b1be790896e59' 2014-05-27 02:27:35 +02:00
imgutils.h
integer.c
integer.h
internal.h lavu: add LOCAL_ALIGNED_32 2014-04-25 06:12:51 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
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 Loose mplayer in MPlayer/incoming/ 2014-06-03 16:03:44 +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
Makefile lavu: add thread message API. 2014-05-26 11:40:15 +02:00
mathematics.c avutil/mathematics/av_add_stable: Avoid av_cmp_q() call 2014-06-02 19:06:39 +02:00
mathematics.h fix various typos 2014-06-03 10:58:19 -08: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
opencl_internal.c
opencl_internal.h
opencl.c opencl: Make init_mtx static with volatile lock 2014-05-10 15:07:33 +02:00
opencl.h opencl: add support for non-pthread locking 2014-05-01 19:28:31 +02:00
opt.c avutil/opt: add av_opt_copy() 2014-06-01 20:49:18 +02:00
opt.h avutil/opt: add av_opt_copy() 2014-06-01 20:49:18 +02:00
parseutils.c
parseutils.h
pca.c avutil/pca: Use av_malloc_array() 2014-05-04 19:00:16 +02:00
pca.h
pixdesc.c Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f' 2014-05-12 00:37:12 +02:00
pixdesc.h fix various typos 2014-06-03 10:58:19 -08:00
pixfmt.h Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88' 2014-06-01 13:18:32 +02:00
qsort.h
random_seed.c
random_seed.h
rational.c
rational.h
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
stereo3d.h
threadmessage.c lavu: add thread message API. 2014-05-26 11:40:15 +02:00
threadmessage.h lavu: add thread message API. 2014-05-26 11:40:15 +02:00
time.c lavu: add av_gettime_relative() 2014-05-17 15:28:03 +02:00
time.h lavu: add av_gettime_relative() 2014-05-17 15:28:03 +02:00
timecode.c Timecode: Support 48fps 2014-05-28 03:25:41 +02:00
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.h
utf8.c
utils.c avutil: Add av_get_time_base_q() 2014-04-22 16:38:33 -04:00
version.h avutil/opt: add av_opt_copy() 2014-06-01 20:49:18 +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