1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavutil
Michael Niedermayer 707138593a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
	Changelog
	libavcodec/adpcmenc.c
	libavcodec/bmp.c
	libavcodec/zmbv.c
	libavutil/log.c
	libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-05 00:11:57 +01:00
..
arm arm: fix av_clipl_int32() asm 2011-10-11 20:25:55 +02:00
avr32
bfin
mips
ppc
sh4
tomi
x86 x86inc: Flag shufps as an floating-point instruction for the AVX emulation code. 2011-11-28 00:24:21 +01:00
adler32.c
adler32.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
aes.c Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
aes.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
attributes.h avutil: add av_noreturn 2011-11-11 04:24:00 +01:00
audioconvert.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
avassert.h
avstring.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avstring.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
avutil.h lavu/error: define AVERROR_BUG. 2011-12-03 15:18:58 +01:00
base64.c
base64.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
bswap.h
colorspace.h
common.h Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
cpu.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cpu.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
crc_data.h
crc.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
crc.h
des.c Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
des.h Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
dict.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
dict.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
error.c lavu/error: define AVERROR_BUG. 2011-12-03 15:18:58 +01:00
error.h lavu/error: define AVERROR_BUG. 2011-12-03 15:18:58 +01:00
eval.c eval: add mathematical constants (PI, E, PHI). 2011-10-13 16:50:20 +02:00
eval.h
fifo.c
fifo.h
file.c av_tempfile: dont try the current directory with mkstemp() unless we are on windows 2011-10-16 22:32:41 +02:00
file.h av_tempfile: Pass int log_offset, void *log_ctx 2011-10-16 21:51:28 +02:00
imgutils.c Merge remote-tracking branch 'qatar/master' 2011-11-20 02:46:06 +01:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
integer.c
integer.h
internal.h avutil: Don't allow using strcasecmp/strncasecmp 2011-11-06 11:52:59 +02:00
intfloat_readwrite.c Merge remote-tracking branch 'qatar/master' 2011-10-12 05:40:57 +02:00
intfloat_readwrite.h
intmath.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
intreadwrite.h
inverse.c
lfg.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
lfg.h
libavutil.v
libm.h Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
lls.c
lls.h
log.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
log.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
lzo.c av_lzo1x_decode: properly handle negative buffer length. 2011-11-05 23:25:20 +01:00
lzo.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
Makefile
mathematics.c
mathematics.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
md5.c
md5.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
mem.c mem: fix memalign hack av_realloc() 2011-10-11 22:03:19 +02:00
mem.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
opt.c avopts: Fix random values being printed in error messages: 2011-11-20 15:02:36 +01:00
opt.h avutil: revert project name messing 2011-11-29 16:09:56 +01:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
pca.c
pca.h
pixdesc.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
pixdesc.h Merge remote-tracking branch 'qatar/master' 2011-11-25 04:34:44 +01:00
pixfmt.h pixfmt: Add 32bit rgb without alpha formats 2011-11-28 02:44:05 +01:00
random_seed.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
random_seed.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rational.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
rational.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rc4.c
rc4.h
samplefmt.c libavutil: increase struct SampleFmtInfo member 'name' length to 8 2011-12-03 00:35:20 +01:00
samplefmt.h lavu: add av_get_alt_sample_fmt(). 2011-11-24 16:55:45 +01:00
sha.c
sha.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
softfloat.c
softfloat.h
timer.h Merge remote-tracking branch 'qatar/master' 2011-11-29 00:20:29 +01:00
tree.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
tree.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
utils.c
x86_cpu.h