Michael Niedermayer 688c3d944d Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  doxy: Define a group for libswscale documentation

Conflicts:
	libavutil/avutil.h
	libswscale/swscale.h

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

2013-12-14 13:09:30 +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

rename new lls code to lls2 to avoid conflict with the old which has a different ABI

2013-11-17 16:41:08 +01: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

avutil/avstring: fix () position

2013-12-11 21:13:51 +01:00

avstring.h

lavu/avstring: add av_utf8_decode() function

2013-11-22 16:51:05 +01:00

avutil.h

Merge remote-tracking branch 'qatar/master'

2013-12-14 13:09:30 +01:00

avutilres.rc

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +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

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01: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

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

cpu_internal.h

Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'

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

cpu.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

cpu.h

Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

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

crc.c

…

crc.h

…

des.c

Merge remote-tracking branch 'qatar/master'

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

des.h

…

dict.c

…

dict.h

lavu/dict.h: extend/clarify docs for av_dict_parse_string()

2013-11-22 15:51:20 +01:00

error.c

…

error.h

…

eval.c

…

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

…

float_dsp.c

Merge remote-tracking branch 'qatar/master'

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

float_dsp.h

…

frame.c

Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

2013-12-09 18:16:35 +01:00

frame.h

Merge commit '7e244c68600f479270e979258e389ed5240885fb'

2013-12-09 21:33:51 +01:00

hash.c

…

hash.h

…

hmac.c

…

hmac.h

…

imgutils.c

…

imgutils.h

…

integer.c

…

integer.h

…

internal.h

Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

2013-12-09 20:52:14 +01:00

intfloat_readwrite.c

Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

2013-12-14 11:13:55 +01:00

intfloat_readwrite.h

Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

2013-12-14 11:13:55 +01:00

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

…

lls1.c

avutil: reintroduce lls1 as the 52 ABI needs it

2013-11-17 16:44:32 +01:00

lls1.h

avutil: reintroduce lls1 as the 52 ABI needs it

2013-11-17 16:44:32 +01:00

lls2.c

rename new lls code to lls2 to avoid conflict with the old which has a different ABI

2013-11-17 16:41:08 +01:00

lls2.h

rename new lls code to lls2 to avoid conflict with the old which has a different ABI

2013-11-17 16:41:08 +01:00

log2_tab.c

…

log.c

avutil/log: skip IO calls on empty strings

2013-12-06 23:30:34 +01:00

log.h

avutil/log: document log callback thread saftey requirements

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

lzo.c

…

lzo.h

…

Makefile

Merge commit '7e244c68600f479270e979258e389ed5240885fb'

2013-12-09 21:33:51 +01:00

mathematics.c

…

mathematics.h

…

md5.c

…

md5.h

…

mem.c

Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'

2013-11-14 15:04:04 +01:00

mem.h

Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'

2013-11-14 15:04:04 +01:00

murmur3.c

…

murmur3.h

…

old_pix_fmts.h

Merge remote-tracking branch 'qatar/master'

2013-11-14 03:26:35 +01:00

opencl_internal.c

…

opencl_internal.h

…

opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

opencl.h

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

opt.c

avutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time

2013-12-07 14:09:36 +01:00

opt.h

fix order of operations in comments

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

parseutils.c

Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

2013-12-12 19:12:33 +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

Merge remote-tracking branch 'qatar/master'

2013-11-14 03:26:35 +01:00

pixdesc.h

Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'

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

pixfmt.h

Merge remote-tracking branch 'qatar/master'

2013-11-14 03:26:35 +01:00

qsort.h

…

random_seed.c

…

random_seed.h

…

rational.c

…

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

…

samplefmt.c

…

samplefmt.h

…

sha512.c

lavu/sha512: Fully unroll the transform function loops

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

sha512.h

…

sha.c

lavu/sha: Fully unroll the transform function loops

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

sha.h

…

softfloat.c

…

softfloat.h

…

stereo3d.c

Merge commit '7e244c68600f479270e979258e389ed5240885fb'

2013-12-09 21:33:51 +01:00

stereo3d.h

Merge commit '7e244c68600f479270e979258e389ed5240885fb'

2013-12-09 21:33:51 +01:00

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

…

tree.c

tree-test: Don't return restricted exit codes

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

tree.h

…

utf8.c

avutil/utf8: put under #ifdef TEST

2013-11-22 17:16:11 +01:00

utils.c

avutil/utils: run ff_check_pixfmt_descriptors() only when ASSERT_LEVEL is > 0

2013-12-06 23:51:58 +01:00

version.h

Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

2013-12-14 11:13:55 +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