Michael Niedermayer 03b88f6b39 Merge remote-tracking branch 'cigaes/master' ... * cigaes/master: lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. lavf/concatdec: implement automatic conversions. lavf/concatdec: reindent after last commit. lavf/concatdec: always do stream matching. lavf/concatdec: check match_streams() return value. lavf/concatdec: use a structure for each stream. ffprobe: use the codec descriptor if no decoder was found. lavf/matroska: add "binary" pseudo-MIME type. lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types. lavc: add a mime_types field to codec descriptors. lavc: add AV_CODEC_ID_BIN_DATA. lavc: add codec descriptors for TTF and OTF. lavc: add codec descriptors for deprecated ids. lavc/codec_desc: add separation comment. tools/ffhash: implement base64 output. tools/ffhash: use av_hash_final_hex(). lavu/hash: add hash_final helpers. Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-04-29 19:29:48 +02:00
..
examples	examples: rename avcodec.c to decoding_encoding.c	2014-04-23 10:32:42 +02:00
APIchanges	lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.	2014-04-29 13:25:52 +02:00
Doxyfile	Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'	2014-02-14 14:38:21 +01:00
Makefile	doc/examples: Add example transcoding.c	2014-03-17 20:56:33 +01:00
RELEASE_NOTES	RELEASE_NOTES: mention new filters	2014-03-23 17:30:52 +01:00
authors.texi	…
bitstream_filters.texi	…
build_system.txt	…
codecs.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
decoders.texi	Fix texinfo error due to wrong @subsubsection	2014-03-27 03:58:29 +01:00
default.css	…
demuxers.texi	lavf/concatdec: implement automatic conversions.	2014-04-29 13:25:59 +02:00
developer.texi	…
devices.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
doxy-wrapper.sh	Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'	2014-02-17 02:22:01 +01:00
encoders.texi	Merge remote-tracking branch 'qatar/master'	2014-04-09 04:54:26 +02:00
errno.txt	…
faq.texi	…
fate.texi	…
fate_config.sh.template	…
ffmpeg-bitstream-filters.texi	…
ffmpeg-codecs.texi	…
ffmpeg-devices.texi	…
ffmpeg-filters.texi	…
ffmpeg-formats.texi	…
ffmpeg-protocols.texi	…
ffmpeg-resampler.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	2014-03-06 21:12:40 +01:00
ffmpeg-scaler.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	2014-03-06 21:12:40 +01:00
ffmpeg-utils.texi	…
ffmpeg.texi	Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'	2014-04-29 01:22:22 +02:00
ffmpeg.txt	…
ffplay.texi	Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'	2014-02-10 13:26:31 +01:00
ffprobe.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
ffprobe.xsd	…
ffserver.conf	…
ffserver.texi	Fix spelling errors in texi files: more informations --> more information allows to --> allows one to	2014-03-27 03:58:56 +01:00
fftools-common-opts.texi	Merge remote-tracking branch 'qatar/master'	2014-03-13 14:21:27 +01:00
filter_design.txt	…
filters.texi	lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.	2014-04-29 13:25:59 +02:00
formats.texi	avformat/options_table: add named constants for avoid_negative_ts	2014-02-24 19:46:11 +01:00
general.texi	Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'	2014-04-23 20:47:13 +02:00
git-howto.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	2014-03-06 21:12:40 +01:00
indevs.texi	Add AVFoundation input device.	2014-04-11 17:51:33 +02:00
issue_tracker.txt	…
libavcodec.texi	…
libavdevice.texi	…
libavfilter.texi	doc: Libavfilter English cleanup	2014-04-12 14:34:11 +02:00
libavformat.texi	…
libavutil.texi	…
libswresample.texi	…
libswscale.texi	…
metadata.texi	…
mips.txt	…
multithreading.txt	…
muxers.texi	Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'	2014-04-29 16:37:22 +02:00
nut.texi	…
optimization.txt	Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'	2014-03-22 23:26:23 +01:00
outdevs.texi	lavd/xv: add window id param	2014-04-19 02:18:45 +02:00
platform.texi	doc/platform: mention that yuvis gas-preprocessor is currently missing some changes	2014-03-12 23:08:41 +01:00
print_options.c	…
protocols.texi	udp: mention default in documentation	2014-03-25 17:53:14 +01:00
rate_distortion.txt	…
resampler.texi	…
scaler.texi	swscale: add two spatially stable dithering methods	2014-03-25 13:48:06 +01:00
snow.txt	…
swresample.txt	…
swscale.txt	…
t2h.init	…
tablegen.txt	…
texi2pod.pl	Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'	2014-04-09 04:26:20 +02:00
texidep.pl	…
utils.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	2014-03-06 21:12:40 +01:00