Michael Niedermayer be41f21a3d Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212' ...

* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

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

2013-11-04 21:26:34 +01:00

..

arm

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

avr32

…

bfin

…

mips

…

ppc

Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'

2013-08-29 14:24:07 +02:00

sh4

…

tomi

…

x86

Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

2013-10-26 02:36:36 +02:00

adler32.c

avutil/adler32: add Doxy group

2013-11-03 00:58:31 +01:00

adler32.h

avutil/adler32: add Doxy group

2013-11-03 00:58:31 +01:00

aes.c

…

aes.h

…

atomic_gcc.h

…

atomic_suncc.h

…

atomic_win32.h

…

atomic.c

…

atomic.h

…

attributes.h

Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'

2013-11-03 12:38:13 +01:00

audio_fifo.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

audio_fifo.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

audioconvert.h

…

avassert.h

…

avstring.c

avstring-test: Mark pointer passed to av_free() as non-const

2013-10-23 13:17:23 +02:00

avstring.h

…

avutil.h

avutil: add av_fopen_utf8()

2013-11-04 15:38:52 +01:00

base64.c

base64-test: Remove posibility of returning restricted exit codes

2013-10-25 11:06:32 +01:00

base64.h

…

blowfish.c

Merge remote-tracking branch 'qatar/master'

2013-09-11 12:51:01 +02:00

blowfish.h

…

bprint.c

lavu/bprint: add append buffer function

2013-08-30 22:36:38 +02:00

bprint.h

lavu/bprint: add append buffer function

2013-08-30 22:36:38 +02:00

bswap.h

…

buffer_internal.h

…

buffer.c

…

buffer.h

…

channel_layout.c

lavu/channel_layout: change av_get_channel_layout() behavior at the next bump

2013-10-17 18:03:09 +02:00

channel_layout.h

lavu/channel_layout: change av_get_channel_layout() behavior at the next bump

2013-10-17 18:03:09 +02:00

colorspace.h

…

common.h

lavu/common: add warning to GET_UTF8 doxy

2013-10-04 16:36:27 +02:00

cpu_internal.h

Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'

2013-08-29 14:15:10 +02:00

cpu.c

Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

2013-10-26 02:36:36 +02:00

cpu.h

Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

2013-10-26 02:36:36 +02:00

crc.c

add crc24 tables

2013-07-10 12:07:53 +00:00

crc.h

add crc24 tables

2013-07-10 12:07:53 +00:00

des.c

Merge remote-tracking branch 'qatar/master'

2013-09-11 12:51:01 +02:00

des.h

…

dict.c

…

dict.h

…

error.c

…

error.h

…

eval.c

Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'

2013-07-28 13:37:46 +02:00

eval.h

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

fifo.c

avutil/fifo: assert that theres enough data in the fifo on drain calls.

2013-09-03 03:11:35 +02:00

fifo.h

…

file_open.c

avutil: add av_fopen_utf8()

2013-11-04 15:38:52 +01:00

file.c

Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'

2013-08-10 10:37:20 +02:00

file.h

cosmetics: Fix "dont" "wont" "doesnt" typos

2013-06-29 02:31:16 +02:00

float_dsp.c

Merge remote-tracking branch 'qatar/master'

2013-09-11 12:51:01 +02:00

float_dsp.h

…

frame.c

Merge commit '529a9893d769f381b72785c500662be2020da5fe'

2013-10-28 10:28:47 +01:00

frame.h

Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'

2013-11-04 21:26:34 +01:00

hash.c

lavu/hash: Add support for RIPEMD

2013-06-16 12:49:39 +02:00

hash.h

lavu/hash: Add support for SHA-2 512

2013-06-15 18:49:12 -03:00

hmac.c

avutil/hmac: make const tables static const

2013-08-06 20:30:55 +02:00

hmac.h

lavu/hmac: Add support for SHA-2

2013-06-12 01:47:42 +02:00

imgutils.c

…

imgutils.h

…

integer.c

…

integer.h

…

internal.h

Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.

2013-10-21 13:49:30 +02:00

intfloat_readwrite.c

…

intfloat_readwrite.h

…

intfloat.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

intmath.c

…

intmath.h

…

intreadwrite.h

…

lfg.c

…

lfg.h

…

libavutil.v

…

libm.h

…

lls.c

Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'

2013-06-30 11:35:52 +02:00

lls.h

Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'

2013-06-30 11:35:52 +02:00

log2_tab.c

…

log.c

avutil/log: make default av_log callback thread safe

2013-10-23 18:15:49 +02:00

log.h

avutil/log: document log callback thread saftey requirements

2013-10-23 18:15:49 +02:00

lzo.c

…

lzo.h

…

Makefile

tools: add benchmark for crypto functions.

2013-09-04 16:36:11 +02:00

mathematics.c

…

mathematics.h

…

md5.c

avutil/md5: reindent after previous commits

2013-05-25 16:11:08 +02:00

md5.h

lavu/md5: Add doxy

2013-06-15 02:22:39 +02:00

mem.c

Merge remote-tracking branch 'qatar/master'

2013-10-17 08:13:42 +02:00

mem.h

Merge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844'

2013-10-26 21:49:04 +02:00

murmur3.c

…

murmur3.h

…

old_pix_fmts.h

Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'

2013-08-06 13:45:21 +02:00

opencl_internal.c

…

opencl_internal.h

…

opencl.c

OpenCL: convert meaningless "device id" output to "device name"

2013-09-17 21:21:11 +02:00

opencl.h

…

opt.c

avutil/opt: fix flags check on non x86

2013-10-29 21:07:45 +01:00

opt.h

fix order of operations in comments

2013-10-23 14:32:04 +02:00

parseutils.c

lavu/parseutils: add av_get_known_color_name()

2013-10-27 09:16:05 +01:00

parseutils.h

lavu/parseutils: add av_get_known_color_name()

2013-10-27 09:16:05 +01:00

pca.c

…

pca.h

…

pixdesc.c

pixdesc: fix NV20* descriptors

2013-09-24 14:02:10 +02:00

pixdesc.h

Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'

2013-10-03 21:29:38 +02:00

pixfmt.h

fix order of operations in comments

2013-10-23 14:32:04 +02:00

qsort.h

…

random_seed.c

Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'

2013-08-08 11:18:17 +02:00

random_seed.h

…

rational.c

avutil/rational: avoid llrint() and rint()

2013-07-04 23:50:58 +02:00

rational.h

libavutil: cast truncated values to uint32_t

2013-08-27 14:25:34 +02:00

rc4.c

…

rc4.h

…

ripemd.c

lavu/ripemd: Add a size optimized version of the transform functions

2013-09-09 11:18:48 +02:00

ripemd.h

lavu: Add RIPEMD hashing

2013-06-15 18:54:01 -03:00

samplefmt.c

…

samplefmt.h

…

sha512.c

lavu/sha512: Fully unroll the transform function loops

2013-09-11 21:55:59 +02:00

sha512.h

lavu: Add SHA-2 512 hashing

2013-06-02 11:27:19 +02:00

sha.c

lavu/sha: Fully unroll the transform function loops

2013-09-11 21:55:59 +02:00

sha.h

…

softfloat.c

avutil/softfloat: remove unneeded include assert.h

2013-07-19 18:56:33 +02:00

softfloat.h

…

time.c

Merge remote-tracking branch 'qatar/master'

2013-09-11 12:51:01 +02:00

time.h

…

timecode.c

…

timecode.h

…

timer.h

…

timestamp.h

avutil/timestamp: remove ""

2013-06-13 14:57:00 +02:00

tree.c

tree-test: Don't return restricted exit codes

2013-10-24 10:59:26 +01:00

tree.h

Merge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986'

2013-08-01 10:41:06 +02:00

utils.c

avutil/utils: check that size_t is unsigned

2013-10-26 22:08:06 +02:00

version.h

Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'

2013-11-04 21:26:34 +01:00

x86_cpu.h

…

xga_font_data.c

…

xga_font_data.h

…

xtea.c

avutil/xtea: add Doxy @file and group

2013-11-03 00:59:38 +01:00

xtea.h

avutil/xtea: add Doxy @file and group

2013-11-03 00:59:38 +01:00