Michael Niedermayer f36da16ede Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f' ... * commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f': http: Support setting custom User-Agent Conflicts: doc/protocols.texi libavformat/http.c See: 2bb1c713cc Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-12 03:45:16 +01:00
..
examples	doc: fix typo	2014-03-07 17:07:37 -05:00
APIchanges	doc/APIchanges: fill in dates	2014-03-11 01:21:56 +01:00
authors.texi
bitstream_filters.texi	doc/bitstream_filters: remove mp3_header_decompress filter	2013-12-14 21:47:51 +01:00
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	Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'	2014-01-30 15:19:51 +01:00
default.css	doc/default.css: sync with ffmpeg-web	2013-11-28 10:27:25 +01:00
demuxers.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
developer.texi	Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'	2013-12-23 12:52:50 +01:00
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
Doxyfile	Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'	2014-02-14 14:38:21 +01:00
encoders.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
errno.txt
faq.texi	doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry	2014-01-03 17:05:44 +01:00
fate_config.sh.template
fate.texi
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 '746dca483a2f0f2639265f6e1c0085c8861875a1'	2014-02-24 09:15:46 +01: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	ffprobe: show best_effort_timestamp in the frame section	2013-12-15 10:46:46 +01:00
ffserver.conf	ffserver: add stream Metadata option	2013-12-16 19:18:45 +01:00
ffserver.texi	doc/ffserver: mention how to access streams through RTSP	2014-01-03 17:03:43 +01:00
fftools-common-opts.texi	Allow hiding the banner.	2013-12-29 22:57:20 +01:00
filter_design.txt
filters.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
formats.texi	avformat/options_table: add named constants for avoid_negative_ts	2014-02-24 19:46:11 +01:00
general.texi	Merge remote-tracking branch 'qatar/master'	2014-03-11 21:24:54 +01: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	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
issue_tracker.txt
libavcodec.texi
libavdevice.texi
libavfilter.texi
libavformat.texi
libavutil.texi
libswresample.texi
libswscale.texi
Makefile	Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'	2014-02-25 20:26:00 +01:00
metadata.texi
mips.txt
multithreading.txt
muxers.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
nut.texi
optimization.txt
outdevs.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
platform.texi	doc/platform: Update to reflect current MSVC build situation	2013-11-27 13:39:42 +00:00
print_options.c
protocols.texi	Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'	2014-03-12 03:45:16 +01:00
rate_distortion.txt
RELEASE_NOTES	update for 2.2	2014-03-01 03:34:59 +01:00
resampler.texi
scaler.texi
snow.txt
swresample.txt
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl	Merge remote-tracking branch 'qatar/master'	2014-02-25 09:02:57 +01:00
texidep.pl	doc: add script to compute texi files dependencies	2013-12-06 10:40:38 +01:00
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