Michael Niedermayer 67f5650a78 Merge remote-tracking branch 'qatar/master' ... * qatar/master: rv34: add NEON rv34_idct_add rv34: 1-pass inter MB reconstruction add SMJPEG muxer avformat: split out common SMJPEG code pictordec: Use bytestream2 functions avconv: use avcodec_encode_audio2() pcmenc: use AVCodec.encode2() avcodec: bump minor version and add APIChanges for the new audio encoding API avcodec: Add avcodec_encode_audio2() as replacement for avcodec_encode_audio() avcodec: add a public function, avcodec_fill_audio_frame(). rv34: Intra 16x16 handling rv34: Inter/intra MB code split Conflicts: Changelog libavcodec/avcodec.h libavcodec/pictordec.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/rv34dsp.asm libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-17 02:37:30 +01:00
..
doxy	doxygen: cleanup style to support older doxy	2011-12-29 17:19:46 +01:00
examples	decoding example: reset pts/dts after subpacket.	2011-12-13 19:47:57 +01:00
APIchanges	Merge remote-tracking branch 'qatar/master'	2012-01-17 02:37:30 +01:00
avconv.texi	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
avtools-common-opts.texi	Merge remote-tracking branch 'qatar/master'	2012-01-12 01:10:32 +01:00
avutil.txt
bitstream_filters.texi	doc/bistream_filters.texi: add documentation for the h264_mp4toannexb filter	2012-01-14 12:36:41 +01:00
build_system.txt
decoders.texi	lavc: add ffwavesynth pseudo-codec.	2011-12-15 18:38:04 +01:00
demuxers.texi	lavf: add SBG demuxer.	2011-12-15 18:38:06 +01:00
developer.texi	doc: make developer.texi point to correct fate doc	2011-12-20 18:12:36 +01:00
encoders.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
errno.txt	doc: add a list of errno codes on some systems.	2011-12-21 19:59:45 +01:00
eval.texi	Fix a bunch of common typos.	2011-12-11 00:32:25 +01:00
faq.texi	Merge remote-tracking branch 'qatar/master'	2012-01-08 03:34:22 +01:00
fate.texi	doc: fate: Move documentation from .txt to .texi	2011-12-20 16:05:01 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi	Clearer explanation of audio channel mapping restrictions	2011-12-22 00:05:47 +01:00
ffmpeg.txt	doc: small ascii diagram on I/O files and streams in ffmpeg.c	2011-10-12 15:43:52 +02:00
ffplay.texi	ffplay: add 10 minute seek support to ffplay	2011-12-14 21:09:08 +01:00
ffprobe.texi	ffprobe: add support to audio frame information printing	2012-01-12 17:34:16 +01:00
ffprobe.xsd	ffprobe: add support to audio frame information printing	2012-01-12 17:34:16 +01:00
ffserver.conf
ffserver.texi	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
filters.texi	docs: remove extra sar entry for scale filter	2012-01-13 00:33:35 +01:00
general.texi	Merge remote-tracking branch 'qatar/master'	2012-01-17 02:37:30 +01:00
git-howto.texi	Merge remote-tracking branch 'qatar/master'	2011-12-10 02:01:03 +01:00
git-howto.txt	githowto: git is generally available as package in most distros.	2011-11-23 23:03:37 +01:00
indevs.texi	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
issue_tracker.txt
libavfilter.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
Makefile	doc: build: TEXIDEP: Recognize verbatim includes	2011-12-24 02:56:52 +01:00
metadata.texi
multithreading.txt
muxers.texi	Merge remote-tracking branch 'qatar/master'	2011-12-20 04:12:09 +01:00
optimization.txt
outdevs.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
platform.texi	Fix a bunch of platform name and other typos.	2012-01-11 13:48:30 +01:00
protocols.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
rate_distortion.txt
RELEASE_NOTES	Release notes: mention cleaned up header includes	2012-01-02 17:21:55 +01:00
snow.txt
soc.txt	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
swresample.txt	swr-docs: update due to last change to swresample	2011-10-06 00:32:01 +02:00
swscale.txt
t2h.init	Merge remote-tracking branch 'qatar/master'	2011-12-10 02:01:03 +01:00
tablegen.txt
texi2pod.pl
viterbi.txt