1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavutil
Michael Niedermayer 7fad19a63d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: cabac: replace explicit memory references with "m" operands
  avplay: don't request a stereo downmix
  wmapro: use av_float2int()
  lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
  lavu: replace int/float punning functions
  lavfi: install libavfilter/vsrc_buffer.h
  Remove extraneous semicolons
  sdp: Restore the original mp4 format h264 extradata if converted
  rtpenc: Add support for mp4 format h264
  rtpenc: Simplify code by introducing a separate end pointer
  movenc: Use the actual converted sample for RTP hinting
  Fix a bunch of common typos.

Conflicts:
	doc/developer.texi
	doc/eval.texi
	doc/filters.texi
	doc/protocols.texi
	ffmpeg.c
	ffplay.c
	libavcodec/mpegvideo.h
	libavcodec/x86/cabac.h
	libavfilter/Makefile
	libavformat/avformat.h
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/gxfenc.c
	libavformat/img2.c
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/rtpenc_h264.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 01:25:37 +01:00
..
arm
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2011-12-09 00:05:51 +01:00
adler32.c Merge remote-tracking branch 'qatar/master' 2011-12-09 00:05:51 +01:00
adler32.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
aes.c Add coverage exclusions for test code. 2011-12-05 20:05:44 +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-12-10 02:01:03 +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-12-10 02:01:03 +01:00
base64.c Add coverage exclusions for test code. 2011-12-05 20:05:44 +01:00
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
cpu.h
crc_data.h
crc.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
crc.h
des.c Add coverage exclusions for test code. 2011-12-05 20:05:44 +01:00
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 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 Add coverage exclusions for test code. 2011-12-05 20:05:44 +01:00
eval.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
fifo.c
fifo.h
file.c
file.h
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
intfloat_readwrite.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
intfloat.h lavu: replace int/float punning functions 2011-12-11 18:47:19 +00:00
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 lavu: introduce av_log_format_line. 2011-12-08 18:47:47 +01:00
log.h lavu: introduce av_log_format_line. 2011-12-08 18:47:47 +01:00
lzo.c Merge remote-tracking branch 'qatar/master' 2011-12-06 01:37:27 +01:00
lzo.h Merge remote-tracking branch 'qatar/master' 2011-12-08 00:23:37 +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 Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X 2011-12-11 03:00:30 +01:00
mem.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
opt.c av_opt: add av_opt_ptr() to return a pointer to a field of a object based on 2011-12-05 03:22:04 +01:00
opt.h Fix compilation for C++ applications 2011-12-05 21:13:45 +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