Michael Niedermayer 17ebef2fc8 Merge commit '2c328a907978b61949fd20f7c991803174337855' ...

* commit '2c328a907978b61949fd20f7c991803174337855':
  pixdesc: add a function for counting planes in a pixel format.
  avplay: remove the -debug option.
  Revert "asfenc: return error on negative timestamp"

Conflicts:
	doc/APIchanges
	doc/ffplay.texi
	ffplay.c
	libavutil/version.h

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

2013-03-20 11:24:11 +01:00

..

arm

Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'

2013-02-12 12:41:09 +01:00

avr32

…

bfin

…

mips

mips: optimization for float aac decoder (sbr module)

2013-02-21 22:43:08 +01:00

ppc

Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'

2013-01-23 14:04:50 +01:00

sh4

…

tomi

Merge remote-tracking branch 'qatar/master'

2013-02-20 12:04:50 +01:00

x86

dsputil: make selectable.

2013-03-12 19:56:58 +01:00

adler32.c

…

adler32.h

…

aes.c

…

aes.h

…

atomic_gcc.h

Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'

2013-03-12 21:39:38 +01:00

atomic_suncc.h

atomic: Add include guards to the implementation headers

2013-03-08 20:54:40 +01:00

atomic_win32.h

atomic: Add include guards to the implementation headers

2013-03-08 20:54:40 +01:00

atomic.c

atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize

2013-03-12 10:41:02 +01:00

atomic.h

atomic: prefer gcc builtins over win32 atomics, if available.

2013-03-12 10:41:09 +01:00

attributes.h

…

audio_fifo.c

…

audio_fifo.h

…

audioconvert.h

…

avassert.h

av_assert should use AV_LOG_PANIC.

2012-12-05 20:25:32 +01:00

avstring.c

Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'

2013-03-08 15:37:21 +01:00

avstring.h

Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'

2013-03-08 14:57:41 +01:00

avutil.h

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

base64.c

lavu/base64: return meaningful error code.

2013-01-05 15:40:40 +01:00

base64.h

lavu/base64: extend/clarify doxy for the base64 API

2013-01-02 23:52:35 +01:00

blowfish.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

blowfish.h

…

bprint.c

lavu: add escape API

2013-03-07 01:12:04 +01:00

bprint.h

lavu: add escape API

2013-03-07 01:12:04 +01:00

bswap.h

…

buffer_internal.h

avutil/buffer: Fix race in pool.

2013-03-18 19:19:22 +01:00

buffer.c

avutil/add_to_pool: remove unused assgnment

2013-03-19 13:35:10 +01:00

buffer.h

Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'

2013-03-08 16:06:20 +01:00

channel_layout.c

Call the common 7.1 wide channel layout "7.1(wide)".

2013-02-09 18:14:46 +01:00

channel_layout.h

lavu/channel_layout: document the semantic of layouts.

2012-12-02 18:51:04 +01:00

colorspace.h

…

common.h

Use the avstring.h locale-independent character type functions

2013-03-07 15:16:36 +02:00

cpu.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

cpu.h

…

crc.c

Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'

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

crc.h

…

des.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

des.h

…

dict.c

Use the avstring.h locale-independent character type functions

2013-03-07 15:16:36 +02:00

dict.h

Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

2013-01-26 13:34:30 +01:00

error.c

…

error.h

…

eval.c

lavu/eval: add bitor and bitand functions

2013-03-17 00:22:47 +01:00

eval.h

…

fifo.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

fifo.h

…

file.c

Merge remote-tracking branch 'qatar/master'

2012-11-30 14:55:12 +01:00

file.h

…

float_dsp.c

floatdsp: restrict->av_restrict

2013-01-24 00:49:47 +01:00

float_dsp.h

floatdsp: restrict->av_restrict

2013-01-24 00:49:47 +01:00

frame.c

avutil/frame: fix video buffer allocation

2013-03-17 02:19:25 +01:00

frame.h

AVFrame.pkt_dts: improve docs

2013-03-19 00:47:00 +01:00

hmac.c

Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'

2013-01-16 12:07:27 +01:00

hmac.h

Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'

2013-01-15 15:57:33 +01:00

imgutils.c

lavu/imgutils: add consistency checks to av_image_copy_plane()

2012-11-25 18:19:59 +01:00

imgutils.h

lavu/imgutils: add consistency checks to av_image_copy_plane()

2012-11-25 18:19:59 +01:00

integer.c

…

integer.h

…

internal.h

Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'

2013-03-14 12:15:02 +01:00

intfloat_readwrite.c

…

intfloat_readwrite.h

…

intfloat.h

…

intmath.c

…

intmath.h

…

intreadwrite.h

lavu/intreadwrite: add AV_[RW][BLN]48

2013-02-13 15:35:54 +00:00

lfg.c

…

lfg.h

…

libavutil.v

…

libm.h

libm: Add fallback definition for cbrt() using pow()

2013-01-22 16:02:31 +01:00

lls.c

Merge remote-tracking branch 'qatar/master'

2013-03-01 13:50:19 +01:00

lls.h

Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'

2013-03-01 13:44:46 +01:00

log2_tab.c

…

log.c

Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'

2013-03-14 12:15:02 +01:00

log.h

Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

2012-12-19 14:28:58 +01:00

lzo.c

Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'

2013-03-16 14:10:09 +01:00

lzo.h

…

Makefile

Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

2013-03-12 21:34:24 +01:00

mathematics.c

av_rescale: support passing MIN/MAX through

2013-01-03 00:02:22 +01:00

mathematics.h

lavu/math: fix than/then typo, and add a comma.

2013-01-03 00:02:51 +01:00

md5.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

md5.h

…

mem.c

mem: Fix usage of memalign() on DJGPP.

2013-03-10 11:12:56 +01:00

mem.h

…

old_pix_fmts.h

…

opt.c

Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'

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

opt.h

opt: Add support to query ranges

2012-12-08 01:34:28 +01:00

parseutils.c

Force using a 64bit intermediate when calculating calendar time with av_timegm().

2013-03-08 02:42:33 +01:00

parseutils.h

lavu/parseutils: remove spurious "]]" in date format specification

2013-02-22 23:45:31 +01:00

pca.c

…

pca.h

…

pixdesc.c

Merge commit '2c328a907978b61949fd20f7c991803174337855'

2013-03-20 11:24:11 +01:00

pixdesc.h

Merge commit '2c328a907978b61949fd20f7c991803174337855'

2013-03-20 11:24:11 +01:00

pixfmt.h

Merge remote-tracking branch 'qatar/master'

2013-01-12 13:42:42 +01:00

qsort.h

…

random_seed.c

…

random_seed.h

…

rational.c

replace av_log(0, by av_log(NULL,

2012-11-23 18:10:02 +01:00

rational.h

…

rc4.c

…

rc4.h

…

samplefmt.c

lavu/samplefmt: return the size of the allocated samples buffer at the next bump

2012-11-25 23:23:24 +01:00

samplefmt.h

libavutil/samplefmt: Fix project name

2012-12-28 14:05:41 +01:00

sha.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

sha.h

…

softfloat.c

…

softfloat.h

…

time.c

…

time.h

…

timecode.c

lavu/timecode: fix time code calculation for 60000/1001 drop frame

2013-01-24 21:06:24 +01:00

timecode.h

…

timer.h

…

timestamp.h

…

tree.c

…

tree.h

…

utils.c

lavu: test for broken binutils on ARM

2013-01-05 16:25:37 +01:00

version.h

Merge commit '2c328a907978b61949fd20f7c991803174337855'

2013-03-20 11:24:11 +01:00

x86_cpu.h

…

xga_font_data.c

…

xga_font_data.h

…

xtea.c

xtea: fix unused variable warning for config_small

2012-12-29 03:37:46 +01:00

xtea.h

…