1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavutil
Michael Niedermayer 022f8d27dd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
	configure
	libavcodec/arm/dca.h
	libavcodec/dca.c
	libavcodec/mlp_parser.c
	libavcodec/version.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavutil/audioconvert.c
	libavutil/avutil.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 01:12:08 +01:00
..
arm arm: fix av_clipl_int32() asm 2011-10-11 20:25:55 +02:00
avr32
bfin
mips
ppc
sh4
tomi
x86 Fix compilation with YASM. 2011-11-20 15:03:32 +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 Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +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-10-10 03:50:58 +02:00
crc.h
des.c
des.h
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
error.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +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
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-11-03 02:16:26 +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 Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +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-11-25 04:34:44 +01:00
pixdesc.h Merge remote-tracking branch 'qatar/master' 2011-11-25 04:34:44 +01:00
pixfmt.h Merge remote-tracking branch 'qatar/master' 2011-11-25 04:34:44 +01:00
random_seed.c
random_seed.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rational.c
rational.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rc4.c
rc4.h
samplefmt.c lavu: add av_get_alt_sample_fmt(). 2011-11-24 16:55:45 +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
tree.c
tree.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
utils.c
x86_cpu.h