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
ppc
sh4
tomi
x86	Merge remote-tracking branch 'qatar/master'	2012-12-20 02:51:35 +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 '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
bprint.h
bswap.h
channel_layout.c
channel_layout.h
colorspace.h
common.h
cpu.c	Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'	2012-12-05 13:34:45 +01:00
cpu.h
crc.c	Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'	2012-12-05 13:34:45 +01:00
crc.h
crc_data.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	Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'	2012-12-06 14:33:38 +01:00
eval.h
fifo.c	Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'	2012-12-05 13:34:45 +01:00
fifo.h
file.c
file.h
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
imgutils.h
integer.c
integer.h
internal.h	Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'	2012-12-05 13:34:45 +01:00
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.c
intmath.h
intreadwrite.h
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
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
log2_tab.c
lzo.c
lzo.h
Makefile
mathematics.c
mathematics.h
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	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
pca.c
pca.h
pixdesc.c	lavu/pixdesc: fix a const qualifier discarding warning.	2012-12-16 20:41:28 +01:00
pixdesc.h
pixfmt.h	Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'	2012-12-19 14:28:58 +01:00
qsort.h
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
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
timecode.h
timer.h
timestamp.h
tree.c
tree.h
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