Michael Niedermayer 947b74ee7d Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772' ...

* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
  D3D11va: add a Direct3D11 video decoder similar to DXVA2

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dxva2_vc1.c
	libavcodec/version.h
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-05-25 22:24:34 +02:00

..

aarch64

Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'

2014-12-09 12:08:29 +01:00

arm

Merge commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73'

2015-03-07 19:30:51 +01:00

avr32

…

bfin

…

mips

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni copy, uni horizontal and uni vertical mc functions

2015-05-07 16:47:34 +02:00

ppc

avutil/ppc/intreadwrite: remove AV_??64 overriding code

2015-03-01 03:15:19 +01:00

sh4

…

tomi

…

x86

avutil/x86/Makefile: fix conditional x86/emms.o build

2015-04-09 01:12:51 +02:00

adler32.c

…

adler32.h

…

aes.c

avutil/aes: Add () to protect the ROT() arguments

2015-02-17 00:22:42 +01:00

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

avutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments

2015-02-17 00:21:48 +01:00

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

…

audioconvert.h

…

avassert.h

…

avstring.c

avutil/avstring: Use size_t in av_strlcatf()

2015-05-11 20:01:15 +02:00

avstring.h

lavu/avstring: add av_append_path_component() funcion

2015-03-31 23:50:46 +02:00

avutil.h

…

avutilres.rc

…

base64.c

…

base64.h

…

blowfish.c

…

blowfish.h

…

bprint.c

…

bprint.h

avutil/bprint: C++ compatible AVBPrint definition.

2014-11-29 03:51:35 +01:00

bswap.h

…

buffer_internal.h

Merge commit 'fbd6c97f9ca858140df16dd07200ea0d4bdc1a83'

2014-11-27 23:42:16 +01:00

buffer.c

avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_make_writable()

2015-03-12 02:15:28 +01:00

buffer.h

…

camellia.c

libavutil: camellia: remove unwanted memory loads

2015-02-10 17:15:36 +01:00

camellia.h

avutil/camellia: fix documentation for av_camellia_crypt()

2015-01-02 21:23:45 +01:00

cast5.c

avutil/cast5: Make iv array static

2015-05-02 14:37:48 +02:00

cast5.h

libavutil: Added cbc mode to cast128

2014-12-19 14:35:29 +01:00

channel_layout.c

…

channel_layout.h

…

color_utils.c

avutil: Extract gamma determination from PNG encoder for future use. Adds private avpriv_get_gamma_from_trc() function to libavutil.

2015-03-05 12:26:22 +01:00

color_utils.h

avutil: Extract gamma determination from PNG encoder for future use. Adds private avpriv_get_gamma_from_trc() function to libavutil.

2015-03-05 12:26:22 +01:00

colorspace.h

…

common.h

libavutil: add av_mod_uintp2

2015-03-20 15:47:31 -03:00

cpu_internal.h

…

cpu.c

avutil: remove pointless bmi1 define

2015-04-19 23:45:35 +01: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 size_t for appending strings

2015-05-10 16:09:07 +02:00

dict.h

avutil: remove FF_CONST_AVUTIL53, its no longer needed

2014-11-24 02:22:19 +01:00

display.c

Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'

2015-03-24 01:14:31 +01:00

display.h

Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'

2015-03-24 01:14:31 +01:00

downmix_info.c

…

downmix_info.h

…

dynarray.h

…

error.c

avutil/error: list most common error code in error_entries when strerror_r() is unavailable

2015-02-10 23:02:24 +01: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

avutil/eval: check for av_malloc failure

2015-04-01 15:59:58 +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 'bf704132a51f5d838365158331d4e535e1df4c8e'

2015-02-14 21:27:44 +01:00

file.h

avutil/file: fix av_tempfile() documentation

2014-11-24 04:59:02 +01:00

fixed_dsp.c

avutil/fixed_dsp: Check for av_malloc() failure

2015-02-22 16:27:28 +01:00

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

avutil: make AVFrameSideData buffers ref-counted.

2015-03-25 12:04:00 +01:00

frame.h

avutil/frame: fix everythnig/everything typo

2015-04-24 10:57:03 +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: Check av_hmac_alloc() return code

2015-03-30 23:24:33 +02:00

hmac.h

…

imgutils.c

imgutils: initialize palette padding bytes in av_image_alloc

2015-05-13 03:58:08 +02:00

imgutils.h

Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat

2015-03-17 23:53:33 +02:00

integer.c

…

integer.h

…

internal.h

avutil/internal: Suppress empty body warning from emms_c()

2015-05-06 15:56:32 +02:00

intfloat.h

…

intmath.c

…

intmath.h

libavutil: add x86 optimized av_popcount

2015-02-25 19:58:00 -03:00

intreadwrite.h

…

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

Merge commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6'

2015-04-20 23:30:33 +02:00

log.h

avutil/log: more complete description of av_log function

2015-04-26 16:34:06 +02:00

lzo.c

avutil/lzo: fix resource leak

2014-10-11 12:15:26 +02:00

lzo.h

…

macros.h

…

Makefile

avutil: Extract gamma determination from PNG encoder for future use. Adds private avpriv_get_gamma_from_trc() function to libavutil.

2015-03-05 12:26:22 +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

libavutil/mem: use size_t for the length in av_strdup()

2015-05-10 16:06:50 +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

avutil/murmur3: Add () to protect the ROT() arguments

2015-02-17 00:18:15 +01:00

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

OpenCL: Fix ABI incompatibility issues

2015-04-28 12:28:53 +02:00

opencl.h

OpenCL: Fix ABI incompatibility issues

2015-04-28 12:28:53 +02:00

opt.c

avutil/opt: Avoid division by 0

2015-05-03 16:37:04 +02:00

opt.h

lavu/opt: add escaping to av_opt_serialize

2014-11-29 00:58:42 +01:00

parseutils.c

Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'

2015-04-07 20:01:36 +02:00

parseutils.h

Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'

2015-04-07 20:46:25 +02:00

pca.c

avutil/pca: Check for av_malloc* failures

2015-03-30 04:37:42 +02:00

pca.h

avutil/pca: Make argument of ff_pca_add() const

2014-09-28 16:17:18 +02:00

pixdesc.c

Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'

2015-05-25 22:24:34 +02:00

pixdesc.h

pixelutils: indent comments in pixdesc.h to be clearer

2015-03-04 21:58:53 +01:00

pixelutils.c

avutil: check pixdescs in a different place

2015-02-10 15:45:02 +01:00

pixelutils.h

…

pixfmt.h

Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'

2015-05-25 22:24:34 +02:00

qsort.h

…

random_seed.c

…

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: move ripemd{256, 320} into separate functions

2015-05-07 15:40:56 +02:00

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

avutil/sha: Protect macro arguments with ()

2015-02-18 22:50:41 +01:00

sha.h

…

softfloat_tables.h

avutil/softfloat_tables: add missing stdint.h include

2015-04-30 17:38:41 -03:00

softfloat.c

libavutil/softfloat: Add test case for av_add_sf

2015-05-14 17:00:46 +02:00

softfloat.h

libavutil/softfloat: Add functions.

2015-04-30 15:05:12 +02:00

stereo3d.c

Merge commit '159a06dfc83d189f753c4583583ddfb571552ff5'

2014-08-14 00:17:47 +02:00

stereo3d.h

…

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

avutil/timer: give each printed value of STOP_TIMER a fixed length

2015-03-27 04:44:58 +01:00

timestamp.h

…

tree.c

…

tree.h

…

twofish.c

libavutil: optimize twofish cipher

2015-02-18 00:59:55 +01:00

twofish.h

libavutil: Added twofish symmetric block cipher

2015-01-29 01:56:11 +01:00

utf8.c

…

utils.c

avutil: check pixdescs in a different place

2015-02-10 15:45:02 +01:00

version.h

Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'

2015-05-25 22:24:34 +02: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

…