1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavutil
Michael Niedermayer 9c41b59423 Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'
* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
  libxvid: K&R formatting cosmetics

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 21:45:39 +02:00
..
aarch64 Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1' 2014-08-04 04:06:34 +02:00
arm avutil: turn arm setend into a cpuflag 2014-08-13 14:50:15 +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 avutil/pixelutils: faster pixelutils_sad_16x16 2014-08-23 20:12:56 +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 Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec' 2014-01-26 01:54:55 +01:00
aes.h
atomic_gcc.h
atomic_suncc.h
atomic_win32.h Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625' 2014-08-15 12:38:36 +02:00
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 Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6' 2014-07-07 00:55:52 +02:00
audioconvert.h
avassert.h
avstring.c Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6' 2014-07-29 20:24:42 +02:00
avstring.h Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6' 2014-07-29 20:24:42 +02:00
avutil.h avutil: fix version macros doxygen module 2014-07-04 20:54:19 +02:00
avutilres.rc
base64.c Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec' 2014-01-26 01:54:55 +01:00
base64.h
blowfish.c
blowfish.h
bprint.c avutil & avdevice: remove av_bprint_fd_contents() 2014-07-15 21:49:56 +02:00
bprint.h avutil & avdevice: remove av_bprint_fd_contents() 2014-07-15 21:49:56 +02:00
bswap.h Fix compile error on bfin. 2014-08-05 01:54:47 +02: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 channel_layout: doxy: merge functions with macros 2014-07-04 22:06:49 +02:00
colorspace.h
common.h
cpu_internal.h Merge commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217' 2014-01-15 14:42:49 +01:00
cpu.c cpu-test: Add unistd.h #include for getopt() 2014-08-13 12:37:25 -07:00
cpu.h avutil: turn arm setend into a cpuflag 2014-08-13 14:50:15 +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.c: Free non-strduped av_dict_set arguments on error. 2014-08-23 15:28:48 +02:00
dict.h dict.c: Free non-strduped av_dict_set arguments on error. 2014-08-23 15:28:48 +02:00
display.c Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4' 2014-07-09 23:57:20 +02:00
display.h Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4' 2014-07-09 23:57:20 +02:00
downmix_info.c Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c' 2014-02-16 02:05:29 +01:00
downmix_info.h fix spelling errors 2014-07-12 22:33:27 +02:00
dynarray.h fix spelling errors 2014-07-12 22:33:27 +02:00
error.c
error.h Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 2014-08-10 18:20:37 +02:00
eval.c Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
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 Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464' 2014-08-26 21:45:39 +02:00
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 avcodec: export motion vectors in frame side data on demand 2014-08-18 14:13:57 +02:00
frame.h avcodec: export motion vectors in frame side data on demand 2014-08-18 14:13:57 +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 '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2' 2014-06-20 22:20:28 +02:00
imgutils.h Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
integer.c
integer.h
internal.h Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h
intmath.c
intmath.h
intreadwrite.h libavutil: document side effects of macros 2014-07-19 14:55:46 +02:00
lfg.c
lfg.h
libavutil.v lavu: stop exporting internal functions 2014-08-12 04:35:52 +02:00
libm.h avutil/libm: fix fminf() emulation build failure due to undefined FFMIN 2014-06-06 21:00:11 +02:00
lls.c drop LLS1, rename LLS2 to LLS 2014-08-09 23:20:31 +02:00
lls.h drop LLS1, rename LLS2 to LLS 2014-08-09 23:20:31 +02:00
log2_tab.c
log.c Loose mplayer in MPlayer/incoming/ 2014-06-03 16:03:44 +02:00
log.h lavu/log: add device category macros 2014-08-18 22:37:03 +02:00
lzo.c avutil/lzo: allow selecting the compression function in the test code 2014-06-24 00:32:34 +02:00
lzo.h
macros.h
Makefile avcodec: export motion vectors in frame side data on demand 2014-08-18 14:13:57 +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 Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3' 2014-08-14 00:29:06 +02:00
mem.h Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3' 2014-08-14 00:29:06 +02:00
motion_vector.h avutil/motion_vector.h: fix coordinate types 2014-08-21 12:27:34 +02:00
murmur3.c
murmur3.h
old_pix_fmts.h
opencl_internal.c lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter() 2014-08-12 03:49:45 +02:00
opencl_internal.h lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter() 2014-08-12 03:49:45 +02:00
opencl.c avutil/opencl: use av_malloc(z)_array() 2014-08-25 16:06:10 +02:00
opencl.h opencl: add support for non-pthread locking 2014-05-01 19:28:31 +02:00
opt.c Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' 2014-08-15 21:26:12 +02:00
opt.h Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126' 2014-08-13 22:39:54 +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 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6' 2014-08-04 22:12:24 +02:00
pixdesc.h Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26' 2014-08-04 21:32:03 +02:00
pixelutils.c avutil/pixelutils: check for malloc failure 2014-08-06 01:45:29 +02:00
pixelutils.h avutil: add pixelutils API 2014-08-05 21:05:52 +02:00
pixfmt.h Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6' 2014-08-04 22:12:24 +02:00
qsort.h
random_seed.c msvc: fix implicitly declared read/close. 2014-08-02 14:52:17 +02:00
random_seed.h
rational.c
rational.h lavu/rational: add syntactic sugar. 2014-01-19 17:12:22 +01:00
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 samplefmt: Add doxygen categories 2014-07-06 11:44:01 -07:00
sha512.c
sha512.h
sha.c
sha.h
softfloat.c
softfloat.h
stereo3d.c Merge commit '159a06dfc83d189f753c4583583ddfb571552ff5' 2014-08-14 00:17:47 +02:00
stereo3d.h Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c' 2014-06-19 23:47:10 +02:00
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 Fix compile error on bfin. 2014-08-05 01:54:47 +02: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 fix spelling errors 2014-07-12 22:33:27 +02:00
version.h dict.c: Free non-strduped av_dict_set arguments on error. 2014-08-23 15:28:48 +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