Michael Niedermayer 2ce43b37fc Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405' ...

* commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405':
  hlsenc: check append_entry return value
  hlsenc: use the basename to generate the list entries
  avstring: add av_basename and av_dirname

Conflicts:
	Changelog
	doc/APIchanges
	libavutil/version.h

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

2012-12-30 13:54:50 +01:00

..

arm

Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

2012-12-08 14:58:56 +01:00

avr32

…

bfin

…

mips

mips: Fixing HAVE_MIPSFPU dependencies

2012-11-21 23:57:29 +01:00

ppc

…

sh4

…

tomi

…

x86

Merge remote-tracking branch 'qatar/master'

2012-12-20 02:51:35 +01:00

adler32.c

…

adler32.h

…

aes.c

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

aes.h

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

attributes.h

…

audio_fifo.c

…

audio_fifo.h

…

audioconvert.h

lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

2012-11-11 13:35:12 -05:00

avassert.h

av_assert should use AV_LOG_PANIC.

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

avstring.c

Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'

2012-12-30 13:54:50 +01:00

avstring.h

Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'

2012-12-30 13:54:50 +01:00

avutil.h

doxy: add ref for lavfi, lpp and lsws.

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

base64.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

base64.h

…

blowfish.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

blowfish.h

…

bprint.c

lavu/bprint: implement av_bprint_strftime().

2012-11-17 19:47:56 +01:00

bprint.h

lavu/bprint: implement av_bprint_strftime().

2012-11-17 19:47:56 +01:00

bswap.h

…

channel_layout.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +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

Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

2012-11-15 11:12:25 +01:00

cpu.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

cpu.h

cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52

2012-11-16 15:04:48 +01:00

crc_data.h

…

crc.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

crc.h

Merge remote-tracking branch 'qatar/master'

2012-11-16 13:23:35 +01:00

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

Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +01:00

eval.h

lavu: remove disabled FF_API_OLD_EVAL_NAMES code

2012-11-07 23:18:05 +01:00

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

file: typo

2012-10-31 17:01:52 +01:00

float_dsp.c

Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +01:00

float_dsp.h

Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +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 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

intfloat_readwrite.c

…

intfloat_readwrite.h

…

intfloat.h

…

intmath.c

Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

2012-11-05 22:51:20 +01:00

intmath.h

Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

2012-11-05 22:51:20 +01:00

intreadwrite.h

…

lfg.c

…

lfg.h

…

libavutil.v

…

libm.h

…

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 '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

mathematics.c

lavu: add av_rescale_delta()

2012-10-27 00:26:35 +02:00

mathematics.h

lavu: add more doxy to av_rescale_delta

2012-10-27 02:58:09 +02:00

md5.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

md5.h

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

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

Merge commit '418693bdc5edad72b0d055f741931612d797eb05'

2012-12-23 13:32:40 +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

lavu/pixdesc: fix a const qualifier discarding warning.

2012-12-16 20:41:28 +01:00

pixdesc.h

pixdesc: add av_get_padded_bits_per_pixel()

2012-11-21 17:05:50 +01:00

pixfmt.h

Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

2012-12-19 14:28:58 +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

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

softfloat.c

…

softfloat.h

…

time.c

…

time.h

…

timecode.c

lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code

2012-11-04 18:10:39 +01:00

timecode.h

lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code

2012-11-04 18:10:39 +01:00

timer.h

…

timestamp.h

…

tree.c

tree-test: fix printf() types

2012-10-31 03:10:35 +01:00

tree.h

lavu: keep context size variables

2012-10-28 14:33:41 +01:00

utils.c

…

version.h

Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'

2012-12-30 13:54:50 +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

…