Michael Niedermayer ada0fc4efa Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a' ... * commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a': lavu: add planar 16 bit and 8 bit rgb with alpha Conflicts: libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h See: e6d4e68755 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-01-15 05:24:01 +01:00
..
aarch64	Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'	2014-12-09 12:08:29 +01:00
arm	Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'	2014-12-09 11:58:13 +01:00
avr32
bfin
mips
ppc	avutil/ppc/util_altivec: add () to VEC_SPLAT16 macro	2014-11-29 13:40:33 +01:00
sh4
tomi
x86	x86/swr: add SSE2/AVX pack_8ch functions	2014-12-30 23:05:27 -03:00
adler32.c
adler32.h
aes.c
aes.h
atomic_gcc.h	lavu/atomic: add support for the new memory model aware gcc built-ins	2014-10-29 14:09:58 -03:00
atomic_suncc.h
atomic_win32.h	msvc: Fix compilation errors due to header include order.	2014-11-27 12:40:18 +01:00
atomic.c	avutil/atomic: reuse ret to avoid dereferencing twice the same value.	2014-12-27 22:14:23 +01:00
atomic.h
attributes.h
audio_fifo.c	avutil/audio_fifo: use av_freep() to avoid leaving stale pointers in memory	2014-12-27 15:49:13 +01:00
audio_fifo.h	Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'	2014-07-07 00:55:52 +02:00
audioconvert.h
avassert.h
avstring.c	avutil/avstring: fix hardcoded separator in av_match_list()	2014-10-23 12:22:21 +02:00
avstring.h	Merge commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad'	2014-11-07 22:33:09 +01:00
avutil.h	avutil: fix version macros doxygen module	2014-07-04 20:54:19 +02:00
avutilres.rc
base64.c
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/bprint: C++ compatible AVBPrint definition.	2014-11-29 03:51:35 +01:00
bswap.h	Fix compile error on bfin.	2014-08-05 01:54:47 +02:00
buffer_internal.h	Merge commit 'fbd6c97f9ca858140df16dd07200ea0d4bdc1a83'	2014-11-27 23:42:16 +01:00
buffer.c	avutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync types arent mixed by mistake	2014-12-06 20:47:41 +01:00
buffer.h
camellia.c	avutil/camellia: cosmetic fixes	2015-01-02 21:24:02 +01:00
camellia.h	avutil/camellia: fix documentation for av_camellia_crypt()	2015-01-02 21:23:45 +01:00
cast5.c	libavutil: Added cbc mode to cast128	2014-12-19 14:35:29 +01:00
cast5.h	libavutil: Added cbc mode to cast128	2014-12-19 14:35:29 +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
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
crc.h
des.c
des.h
dict.c	avutil/dict: Use av_freep() to avoid leaving stale pointers in memory	2014-12-27 15:48:32 +01:00
dict.h	avutil: remove FF_CONST_AVUTIL53, its no longer needed	2014-11-24 02:22:19 +01: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
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	avutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers	2014-10-19 22:32:14 +02:00
error.h	avutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers	2014-10-19 22:32:14 +02:00
eval.c	Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'	2014-08-15 21:00:50 +02:00
eval.h
fifo.c	avutil: remove FF_CONST_AVUTIL53, its no longer needed	2014-11-24 02:22:19 +01:00
fifo.h	avutil: remove FF_CONST_AVUTIL53, its no longer needed	2014-11-24 02:22:19 +01:00
file_open.c	Merge commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48'	2014-11-27 11:10:26 +01:00
file.c	Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'	2014-08-26 21:45:39 +02:00
file.h	avutil/file: fix av_tempfile() documentation	2014-11-24 04:59:02 +01:00
fixed_dsp.c
fixed_dsp.h
float_dsp.c	avutil/float_dsp: add avpriv_float_dsp_alloc()	2014-11-18 11:43:01 +01:00
float_dsp.h	avutil/float_dsp: add avpriv_float_dsp_alloc()	2014-11-18 11:43:01 +01:00
frame.c	Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'	2014-12-19 03:57:59 +01:00
frame.h	avcodec, avutil: allow more control about how samples are skipped	2014-10-02 20:21:00 +02:00
hash.c	lavu/hash.c: Add missing "static const".	2014-08-31 10:33:02 +02:00
hash.h
hmac.c	avutil/hmac: use av_freep() to avoid leaving stale pointers in memory	2014-12-27 15:50:01 +01:00
hmac.h
imgutils.c	Merge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8'	2015-01-15 05:07:25 +01:00
imgutils.h	Merge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8'	2015-01-15 05:07:25 +01:00
integer.c
integer.h
internal.h	Factorize avpriv_mirror() out	2015-01-05 01:45:49 +01:00
intfloat.h
intmath.c
intmath.h	avutil/intmath: enable builtin intrinsics for icl and msvc.	2014-10-26 17:20:55 +01:00
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	Remove fminf() emulation.	2014-11-08 11:31:11 +01:00
lls.c	avutil/lls: Make unchanged function arguments const	2014-09-28 19:32:07 +02:00
lls.h	avutil/lls: Make unchanged function arguments const	2014-09-28 19:32:07 +02:00
log2_tab.c
log.c	log: Unbreak no-tty support on 256color terminals	2014-09-26 20:56:16 +02:00
log.h	lavu/log: add device category macros	2014-08-18 22:37:03 +02:00
lzo.c	avutil/lzo: fix resource leak	2014-10-11 12:15:26 +02:00
lzo.h
macros.h
Makefile	libavutil: Added Camellia symmetric block cipher	2015-01-02 15:19:36 +01:00
mathematics.c
mathematics.h
md5.c	avutil/md5: workaround clang 3.5 #20849	2014-09-05 00:43:48 +02:00
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: remove obsolete FF_API_OLD_OPENCL cruft	2014-09-15 15:50:17 -03:00
opencl.h	avutil/opencl: don't include config.h	2015-01-12 13:49:56 -03:00
opt.c	Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'	2015-01-06 21:37:48 +01:00
opt.h	lavu/opt: add escaping to av_opt_serialize	2014-11-29 00:58:42 +01:00
parseutils.c	Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'	2014-10-26 02:38:26 +01:00
parseutils.h
pca.c	avutil/pca: Make argument of ff_pca_add() const	2014-09-28 16:17:18 +02:00
pca.h	avutil/pca: Make argument of ff_pca_add() const	2014-09-28 16:17:18 +02:00
pixdesc.c	lavu: add planar 16 bit and 8 bit rgb with alpha	2015-01-14 17:17:24 +01:00
pixdesc.h	Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'	2014-10-08 22:53:48 +02:00
pixelutils.c	avutil/pixelutils: add small buffers tests	2014-09-02 07:29:41 +02:00
pixelutils.h	avutil: add pixelutils API	2014-08-05 21:05:52 +02:00
pixfmt.h	Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'	2015-01-15 05:24:01 +01: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	avutil/rational: Check that av_reduce() returns values within the requested max	2014-12-29 15:52:34 +01:00
rational.h
rc4.c
rc4.h
replaygain.h
ripemd.c
ripemd.h
samplefmt.c	avutil: remove obsolete FF_API_SAMPLES_UTILS_RETURN_ZERO cruft	2014-10-05 17:09:56 -03:00
samplefmt.h	avutil: remove obsolete FF_API_GET_BITS_PER_SAMPLE_FMT cruft	2014-10-05 17:09:49 -03:00
sha512.c
sha512.h
sha.c
sha.h
softfloat.c
softfloat.h	avutil/softfloat: Fix undefined shift in av_add_sf()	2014-10-10 19:36:12 +02:00
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
thread.h	thread: use "" instead of <> for including the w32pthreads wrapper	2014-12-14 18:15:57 +01:00
threadmessage.c
threadmessage.h
time_internal.h	avutil/time_internal: do not attempt to override *time_r() macros	2014-11-05 18:44:15 +01:00
time.c	Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'	2014-10-24 11:06:56 +02:00
time.h	Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'	2014-10-24 11:06:56 +02:00
timecode.c
timecode.h
timer.h	Fix compile error on bfin.	2014-08-05 01:54:47 +02:00
timestamp.h
tree.c
tree.h
utf8.c
utils.c	Add FFMPEG_VERSION into the binary libs	2014-12-19 19:32:40 +01:00
version.h	Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'	2015-01-15 05:24:01 +01:00
wchar_filename.h	Merge commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48'	2014-11-27 11:10:26 +01:00
x86_cpu.h
xga_font_data.c
xga_font_data.h
xtea.c
xtea.h