ffmpeg/libavutil
Michael Niedermayer fae714a9fb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: add presets
  rtsp: Expose the flag options via private AVOptions for sdp and rtp, too
  rtsp: Make the rtsp flags avoptions set via a define
  rtpenc: Set a default video codec
  avoptions: Fix av_opt_flag_is_set
  rtp: Fix ff_rtp_get_payload_type
  doc: Update the documentation on setting options for RTSP
  rtsp: Remove the separate filter_source variable
  rtsp: Accept options via private avoptions instead of URL options
  rtsp: Simplify AVOption definitions
  rtsp: Merge the AVOption lists
  lavfi: port libmpcodecs delogo filter
  lavfi: port boxblur filter from libmpcodecs
  lavfi: add negate filter
  lavfi: add LUT (LookUp Table) generic filters
  AVOptions: don't segfault on NULL parameter in av_set_options_string()
  avio: Check for invalid buffer length.
  mpegenc/mpegtsenc: add muxrate private options.
  lavf: deprecate AVFormatContext.file_size
  mov: add support for TV metadata atoms tves, tvsn and stik

Conflicts:
	Changelog
	doc/filters.texi
	doc/protocols.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfilter.h
	libavfilter/formats.c
	libavfilter/internal.h
	libavfilter/vf_boxblur.c
	libavfilter/vf_delogo.c
	libavfilter/vf_lut.c
	libavformat/mpegtsenc.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-18 01:54:40 +02:00
..
arm arm: fix av_clipl_int32() asm 2011-10-11 20:25:55 +02:00
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h lavu/attributes: introduce AV_NOWARN_DEPRECATED. 2011-09-25 11:18:41 +02:00
audioconvert.c audioconvert: fix type of av_get_default_channel_layout 2011-10-07 02:53:18 +02:00
audioconvert.h audioconvert: fix type of av_get_default_channel_layout 2011-10-07 02:53:18 +02:00
avassert.h
avstring.c avstring: fix return discards qualifiers from pointer target type. 2011-10-17 22:55:00 +02:00
avstring.h av_string: add av_asprintf(). 2011-09-04 09:37:41 +02:00
avutil.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
base64.c
base64.h
bswap.h
colorspace.h
common.h
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 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 dict: fix assignment discards qualifiers from pointer target type warnings. 2011-10-17 22:56:13 +02:00
dict.h
error.c
error.h
eval.c eval: add mathematical constants (PI, E, PHI). 2011-10-13 16:50:20 +02:00
eval.h
fifo.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
fifo.h fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior 2011-08-30 10:03:13 +02:00
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
imgutils.h
integer.c
integer.h
internal.h
intfloat_readwrite.c Merge remote-tracking branch 'qatar/master' 2011-10-12 05:40:57 +02:00
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
lzo.c
lzo.h
Makefile Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
mathematics.c
mathematics.h
md5.c
md5.h
mem.c mem: fix memalign hack av_realloc() 2011-10-11 22:03:19 +02:00
mem.h Introduce av_realloc_f. 2011-09-28 18:13:52 +02:00
opt.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
opt.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
parseutils.c parseutils: fix various cast qualifier warnings. 2011-10-17 22:57:48 +02:00
parseutils.h
pca.c
pca.h
pixdesc.c pixdesc: fix gbr24p 2011-10-09 02:04:54 +02:00
pixdesc.h
pixfmt.h Start adding pixel definitions for planar rgb. 2011-10-08 23:19:14 +02:00
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c
sha.h
softfloat.c
softfloat.h
timer.h
tree.c
tree.h
utils.c lavu: add av_get_media_type_string() convenience function 2011-08-20 14:20:25 +02:00
x86_cpu.h