Michael Niedermayer cabbd271a5 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (24 commits) flvdec: remove incomplete, disabled seeking code mem: add support for _aligned_malloc() as found on Windows lavc: Extend the documentation for avcodec_init_packet flvdec: remove incomplete, disabled seeking code http: replace atoll() with strtoll() mpegts: remove unused/incomplete/broken seeking code af_amix: allow float planar sample format as input af_amix: use AVFloatDSPContext.vector_fmac_scalar() float_dsp: add x86-optimized functions for vector_fmac_scalar() float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil lavr: Add x86-optimized function for flt to s32 conversion lavr: Add x86-optimized function for flt to s16 conversion lavr: Add x86-optimized functions for s32 to flt conversion lavr: Add x86-optimized functions for s32 to s16 conversion lavr: Add x86-optimized functions for s16 to flt conversion lavr: Add x86-optimized function for s16 to s32 conversion rtpenc: Support packetizing iLBC rtpdec: Add a depacketizer for iLBC Implement the iLBC storage file format mov: Support muxing/demuxing iLBC ... Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/dsputil.c libavcodec/version.h libavformat/movenc.c libavformat/mpegts.c libavformat/version.h libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-06-19 20:53:27 +02:00
..
doxy
examples	update filtering_audio example	2012-06-05 03:02:41 +02:00
APIchanges	Merge remote-tracking branch 'qatar/master'	2012-06-18 20:07:00 +02:00
avtools-common-opts.texi	cmdutils: allow to specify a stream by its ID.	2012-05-20 12:47:27 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi	build: Add 'check' target to run all compile and test targets.	2012-05-15 19:10:46 +02:00
encoders.texi	doc/encoders: update libvpxenc mappings	2012-06-13 11:33:00 +02:00
errno.txt
eval.texi
faq.texi
fate.texi	Merge remote-tracking branch 'qatar/master'	2012-06-15 00:14:21 +02:00
ffmpeg.texi	Merge remote-tracking branch 'qatar/master'	2012-06-04 22:59:32 +02:00
ffmpeg.txt
ffplay.texi	doc: add syntax.texi file	2012-05-22 00:39:53 +02:00
ffprobe.texi	ffprobe: add -show_data option.	2012-06-18 09:38:36 +02:00
ffprobe.xsd	ffprobe: dump AVPacket.convergence_duration.	2012-06-18 09:39:17 +02:00
ffserver.conf
ffserver.texi
filter_design.txt	lavfi: drop planar/packed negotiation support	2012-05-16 13:16:05 +02:00
filters.texi	doc: add two similar overlay "side-by-side" examples.	2012-06-17 13:20:04 +02:00
general.texi	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
git-howto.texi	Merge remote-tracking branch 'qatar/master'	2012-04-13 21:50:37 +02:00
git-howto.txt
indevs.texi	v4l2: allow to convert monotonic timestamps.	2012-04-04 15:22:44 +02:00
issue_tracker.txt
libavfilter.texi
Makefile	doc: add syntax.texi file	2012-05-22 00:39:53 +02:00
metadata.texi
multithreading.txt
muxers.texi	doc/muxers: add documentation for the md5 and framemd5 muxers	2012-04-07 13:57:40 +02:00
optimization.txt
outdevs.texi	sdl: fix aspect ratio computations.	2012-06-10 09:57:50 +02:00
platform.texi	Merge remote-tracking branch 'qatar/master'	2012-05-19 00:52:25 +02:00
print_options.c	print_options: warn that the files are generated.	2012-04-23 18:14:25 +02:00
protocols.texi	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
rate_distortion.txt
RELEASE_NOTES	release_notes: update	2012-05-25 17:27:40 +02:00
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi	doc/syntax: escape '@' to fix a warning.	2012-05-29 07:40:58 +02:00
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt