Michael Niedermayer bb44f7d5d7 Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4' ...

* commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4':
  pixdesc: return color properties names

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixdesc.h
	libavutil/version.h

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

2014-10-08 22:53:48 +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

…

mips

…

ppc

avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8

2014-09-11 18:36:34 +02:00

sh4

…

tomi

…

x86

avutil/lls: Make unchanged function arguments const

2014-09-28 19:32:07 +02:00

adler32.c

…

adler32.h

…

aes.c

…

aes.h

…

atomic_gcc.h

…

atomic_suncc.h

…

atomic_win32.h

Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'

2014-08-15 12:38:36 +02:00

atomic.c

…

atomic.h

…

attributes.h

…

audio_fifo.c

…

audio_fifo.h

Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'

2014-07-07 00:55:52 +02:00

audioconvert.h

…

avassert.h

…

avstring.c

avutil/avstring: Factor av_match_list() out

2014-10-02 18:51:05 +02:00

avstring.h

avutil/avstring: Factor av_match_list() out

2014-10-02 18:51:05 +02:00

avutil.h

…

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

lavu/bprint: add const to av_bprint_is_complete() argument.

2014-09-21 19:42:21 +02:00

bswap.h

Fix compile error on bfin.

2014-08-05 01:54:47 +02:00

buffer_internal.h

…

buffer.c

…

buffer.h

…

channel_layout.c

…

channel_layout.h

…

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

Fix "passing argument 1 of av_free discards const qualifier from pointer target type"

2014-09-13 22:32:20 +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

…

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

libavutil/error: fix build with musl toolchain

2014-09-03 20:01:25 +02:00

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

…

fifo.h

…

file_open.c

…

file.c

Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'

2014-08-26 21:45:39 +02:00

file.h

…

fixed_dsp.c

…

fixed_dsp.h

…

float_dsp.c

…

float_dsp.h

…

frame.c

Add missing "const" all over the place.

2014-08-29 18:57:25 +02: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

…

hmac.h

…

imgutils.c

…

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.h

…

intmath.c

…

intmath.h

intmath.h: Remove duplicated ARM include.

2014-08-31 18:33:27 +02: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

…

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

…

lzo.h

…

macros.h

…

Makefile

avutil: remove obsolete FF_API_INTFLOAT cruft

2014-10-05 17:10:03 -03: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: remove obsolete FF_API_OLD_OPENCL cruft

2014-09-15 15:50:17 -03:00

opt.c

avutil: remove obsolete FF_API_FIND_OPT cruft

2014-10-05 17:09:53 -03:00

opt.h

avutil: remove obsolete FF_API_FIND_OPT cruft

2014-10-05 17:09:53 -03:00

parseutils.c

…

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

Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'

2014-10-08 22:53:48 +02: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 '04ccd584a70fad4ebb29ca340d704970ff313cbc'

2014-10-08 22:37:59 +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

…

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

…

stereo3d.c

Merge commit '159a06dfc83d189f753c4583583ddfb571552ff5'

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

stereo3d.h

…

threadmessage.c

…

threadmessage.h

…

time.c

time: Add missing zero

2014-09-08 21:46:12 +02:00

time.h

…

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

fix spelling errors

2014-07-12 22:33:27 +02:00

version.h

Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'

2014-10-08 22:53:48 +02:00

x86_cpu.h

…

xga_font_data.c

…

xga_font_data.h

…

xtea.c

…

xtea.h

…