Michael Niedermayer 25be63005f Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b' ...

* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
  lavu: Add av_strnstr()
  h264: Allow discarding the cropping information from SPS

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

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

2013-01-25 14:36:45 +01:00

..

arm

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

2013-01-23 14:31:55 +01:00

avr32

…

bfin

…

mips

mips: move vector_fmul_window_mips to libavutil

2013-01-16 20:15:48 +01:00

ppc

Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'

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

sh4

…

tomi

…

x86

Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

2013-01-23 14:31:55 +01:00

adler32.c

…

adler32.h

…

aes.c

…

aes.h

…

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 'b85a5e87af4254b80913fe33591d96361f30832b'

2013-01-25 14:36:45 +01:00

avstring.h

Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'

2013-01-25 14:36:45 +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

…

bprint.h

…

bswap.h

…

channel_layout.c

…

channel_layout.h

lavu/channel_layout: document the semantic of layouts.

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

colorspace.h

…

common.h

lavu: check that assert level is defined

2013-01-05 12:21:39 +01:00

cpu.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

cpu.h

…

crc_data.h

…

crc.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

crc.h

…

des.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

des.h

…

dict.c

…

dict.h

…

error.c

…

error.h

…

eval.c

lavu/eval: extend if/ifnot functions to accept a third parameter

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

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 remote-tracking branch 'qatar/master'

2013-01-19 13:20:25 +01:00

intfloat_readwrite.c

…

intfloat_readwrite.h

…

intfloat.h

…

intmath.c

…

intmath.h

…

intreadwrite.h

…

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

…

lls.h

…

log2_tab.c

…

log.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

log.h

Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

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

lzo.c

…

lzo.h

…

Makefile

Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'

2013-01-16 12:07:27 +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: minor simplification of the alignment hack code

2012-12-14 05:36:22 +01:00

mem.h

…

old_pix_fmts.h

…

opt.c

Drop unnecessary 'l' length modifier when printfing double values.

2012-12-31 11:20:45 +01:00

opt.h

opt: Add support to query ranges

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

parseutils.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

parseutils.h

lavu/parseutils: accept %J for hours >= 24.

2012-12-02 11:48:56 +01:00

pca.c

…

pca.h

…

pixdesc.c

Merge remote-tracking branch 'qatar/master'

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

pixdesc.h

pixdesc: add av_get_padded_bits_per_pixel()

2012-11-21 17:05:50 +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 'b85a5e87af4254b80913fe33591d96361f30832b'

2013-01-25 14:36:45 +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

…