Michael Niedermayer 9ebe041e1c Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2' ...

* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
  parseutil: Add more resolution aliases

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

2015-07-20 04:32:28 +02:00

..

aarch64

…

arm

arm: only enable setend on ARMv6

2015-06-05 17:14:10 +02:00

avr32

…

bfin

…

mips

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for idctdsp functions

2015-07-07 14:35:15 +02:00

ppc

avutil/ppc/cpu: add include avassert.h

2015-06-05 19:12:58 +02:00

sh4

…

tomi

…

x86

avutil/x86/bswap: force inline asm versions with ICC

2015-07-18 20:48:09 -03:00

adler32.c

avutil/adler32: Fix data type in test code

2015-06-19 02:25:48 +02:00

adler32.h

…

aes.c

avutil/aes: Fix types

2015-06-19 02:25:48 +02:00

aes.h

…

atomic_gcc.h

…

atomic_suncc.h

…

atomic_win32.h

…

atomic.c

…

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

…

audio_fifo.h

…

audioconvert.h

…

avassert.h

…

avstring.c

avutil/avstring: Do not print NULL

2015-06-19 15:57:32 +02:00

avstring.h

lavu/avstring: add av_append_path_component() funcion

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

avutil.h

Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'

2015-07-03 03:22:48 +02:00

avutilres.rc

…

base64.c

…

base64.h

…

blowfish.c

…

blowfish.h

…

bprint.c

…

bprint.h

…

bswap.h

…

buffer_internal.h

…

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

…

cast5.c

avutil/cast5: Make iv array static

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

cast5.h

…

channel_layout.c

libavutil/channel_layout: Correctly return layout when channel specification ends with a trailing 'c'.

2015-06-09 22:44:34 +02:00

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

avutil/colorspace: Remove RGB_TO_Y/U/V

2015-06-06 18:21:01 +02:00

common.h

libavutil: add av_mod_uintp2

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

cpu_internal.h

Merge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4'

2015-05-31 23:59:48 +02:00

cpu.c

x86: add AV_CPU_FLAG_AVXSLOW flag

2015-05-31 12:07:11 +02:00

cpu.h

Merge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331'

2015-05-31 22:47:50 +02:00

crc.c

avutil/crc: Fix type of p table so its content fits without overflwoing

2015-06-19 02:25:48 +02:00

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

…

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

…

eval.c

avutil/eval: check for av_malloc failure

2015-04-01 15:59:58 +02:00

eval.h

…

fifo.c

avutil/fifo: Fix the case where func() returns less bytes than requested in av_fifo_generic_write()

2015-07-14 17:28:55 +02:00

fifo.h

…

file_open.c

…

file.c

Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

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

file.h

…

fixed_dsp.c

avutil/fixed_dsp: remove ff_ prefix from static function

2015-06-20 03:39:09 -03:00

fixed_dsp.h

libavutil: Add new fixed dsp functions.

2015-06-03 22:50:53 +02:00

float_dsp.c

…

float_dsp.h

avutil/float_dsp: Fix ambiguous wording about vector products

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

frame.c

avutil/frame: fix crash with av_frame_unref(NULL)

2015-07-13 19:26:44 +02:00

frame.h

avutil/frame: Update AVFrame docs library references

2015-07-18 10:46:36 +02:00

hash.c

…

hash.h

…

hmac.c

avutil/hmac: Check av_hmac_alloc() return code

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

hmac.h

…

imgutils.c

avutil/imgutils: Simplify pix_fmt validity check in av_image_get_linesize()

2015-06-12 23:23:59 +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

Put a space between string literals and macros.

2015-07-07 21:10:15 +02:00

intfloat.h

…

intmath.c

…

intmath.h

avutil/intmath: check for ICC before GCC

2015-07-18 19:59:34 -03:00

intreadwrite.h

…

lfg.c

…

lfg.h

…

libavutil.v

…

libm.h

…

lls.c

…

lls.h

…

log2_tab.c

…

log.c

Merge commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6'

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

log.h

avutil/log: modify AV_LOG_MAX_OFFSET for AV_LOG_TRACE

2015-06-26 14:02:35 +02:00

lzo.c

…

lzo.h

…

macros.h

…

Makefile

lavu: Makefile: skip atomic.c if native atomics are available

2015-07-01 21:40:16 +02:00

mathematics.c

…

mathematics.h

…

md5.c

…

md5.h

…

mem_internal.h

avutil/mem_internal: add missing header includes

2015-07-13 21:54:15 -03:00

mem.c

Factor duplicated ff_fast_malloc() out into mem_internal.h

2015-07-13 02:41:43 +02:00

mem.h

…

motion_vector.h

…

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

…

opencl_internal.h

…

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

doc: avoid incorrect phrase 'allows to'

2015-06-16 21:48:51 +02:00

parseutils.c

Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'

2015-07-20 04:32:28 +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

…

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

doc: fix spelling errors

2015-06-14 15:09:33 +02:00

qsort.h

…

random_seed.c

…

random_seed.h

…

rational.c

avutil: Add av_q2intfloat()

2015-05-26 18:31:53 +02:00

rational.h

avutil: Add av_q2intfloat()

2015-05-26 18:31:53 +02:00

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

…

samplefmt.h

…

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

avutil/softfloat: Move av_sf2double() to header

2015-06-11 16:16:38 +02:00

softfloat.h

softfloat: make av_div_sf() inline

2015-06-13 22:28:39 -03:00

stereo3d.c

…

stereo3d.h

…

thread.h

…

threadmessage.c

…

threadmessage.h

…

time_internal.h

…

time.c

…

time.h

…

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

Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'

2015-07-03 03:22:48 +02:00

version.h

Merge commit '832129431fd5c693b12c32a1563944c631feaf36'

2015-07-03 21:06:46 +02:00

wchar_filename.h

…

x86_cpu.h

…

xga_font_data.c

…

xga_font_data.h

…

xtea.c

…

xtea.h

…