Michael Niedermayer e5bae39f46 Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b' ... * commit '5d3addb937946eca5391e40b5e6308e74ac6f77b': Add a quality factor packet side data Conflicts: doc/APIchanges ffmpeg.c libavcodec/avcodec.h libavcodec/mpegvideo_enc.c libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>		2015-07-21 00:54:42 +02:00
..
examples	examples/demuxing_decoding: use properties from frame instead of video_dec_ctx	2015-06-15 18:32:18 +02:00
APIchanges	Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'	2015-07-21 00:54:42 +02:00
authors.texi
bitstream_filters.texi	avcodec: add unpack packed B-frames bitstream filter	2015-04-05 02:24:56 +02:00
bootstrap.min.css
build_system.txt	doc/build_system: Document GEN, text taken from the webpage	2015-05-27 12:23:01 +02:00
codecs.texi	avcodec/h264: Greenmetadata SEI parsing	2015-06-30 23:20:36 +02:00
decoders.texi	doc: avoid incorrect phrase 'allows to'	2015-06-16 21:48:51 +02:00
default.css
demuxers.texi	concatdec: add support for injecting packet metadata	2015-07-17 00:12:04 +02:00
developer.texi	doc/developer: add url for sample files	2015-07-18 21:20:34 +02:00
devices.texi
doxy-wrapper.sh	doc/doxy-wrapper.sh: autodetect version	2015-02-02 05:04:14 +01:00
Doxyfile
encoders.texi	avcodec: add libkvazaar HECV encoder	2015-07-14 18:00:36 +02:00
errno.txt
faq.texi	doc: avoid the incorrect phrase 'allow to'	2015-03-08 21:59:28 +01:00
fate_config.sh.template	Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'	2015-05-16 21:14:01 +02:00
fate.texi	doc: Add $branch to FATE config template	2015-05-16 17:06:35 +02:00
ffmpeg-bitstream-filters.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-codecs.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-devices.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-filters.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-formats.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-protocols.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-resampler.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-scaler.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg-utils.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
ffmpeg.texi	doc/ffmpeg: remove tips	2015-06-10 13:08:48 -08:00
ffmpeg.txt
ffplay.texi	Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'	2015-05-02 22:31:20 +02:00
ffprobe.texi	doc: More semantic markup using @samp and @var where appropriate	2015-03-23 17:08:08 +01:00
ffprobe.xsd	ffprobe: print stream_index with frame data	2015-05-27 11:19:19 +02:00
ffserver.conf	doc/ffserver: Add entry for missing jpeg variant	2015-06-08 03:41:57 +02:00
ffserver.texi	Use @verbatim instead of @example for ASCII arts	2015-04-11 01:14:51 +02:00
fftools-common-opts.texi	Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'	2015-04-20 02:48:19 +02:00
filter_design.txt
filters.texi	avfilter: add random video filter	2015-07-19 19:01:00 +00:00
formats.texi	doc/formats.texi: document max_interlave_delta muxing option	2015-06-01 18:34:40 +02:00
general.texi	Add support for Audible AAX (and AAX+) files	2015-07-19 20:28:39 +02:00
git-howto.texi	git-howto.texi: fix a typo	2015-04-23 23:56:21 -07:00
indevs.texi	dshow: add capture device save and load	2015-04-22 20:12:36 +02:00
issue_tracker.txt
libavcodec.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
libavdevice.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
libavfilter.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
libavformat.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
libavutil.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
libswresample.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
libswscale.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
Makefile	doc/examples: add directory listing example	2015-03-28 03:13:44 +01:00
metadata.texi	doc: More semantic markup using @samp and @var where appropriate	2015-03-23 17:08:08 +01:00
mips.txt
multithreading.txt
muxers.texi	Add support for Audible AAX (and AAX+) files	2015-07-19 20:28:39 +02:00
nut.texi	doc: set documentencoding on toplevel texi files.	2015-02-19 11:30:30 +01:00
optimization.txt	x86/doc/Makefile: DBG=1 to preprocess external asm	2015-02-17 13:08:04 +01:00
outdevs.texi
platform.texi	Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'	2015-02-21 12:08:31 +01:00
print_options.c	doc: fix spelling errors	2014-12-01 00:31:06 +01:00
protocols.texi	avformat/async: support filling with a background thread.	2015-07-18 01:46:50 +02:00
rate_distortion.txt
resampler.texi
scaler.texi
snow.txt
style.min.css
swresample.txt
swscale.txt
t2h.init
t2h.pm	stop embedding the build date	2015-02-02 05:04:14 +01:00
tablegen.txt
texi2pod.pl	doc/texi2pod: fix an unescaped left brace	2015-07-05 19:02:48 -03:00
texidep.pl
utils.texi	Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'	2015-07-20 04:32:28 +02:00
writing_filters.txt	doc/writing_filters: use ffmpeg.org instead of wikimedia.org for lena image	2014-11-19 19:55:02 +01:00