Michael Niedermayer ca2369cdee Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab' ... * commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab': http: Add support reading ICY metadata Conflicts: doc/protocols.texi libavformat/http.c See: a92fbe16f2 See: 636273d3d4 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-12 03:18:12 +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
build_system.txt
codecs.texi
decoders.texi
default.css
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
devices.texi
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
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
ffprobe.xsd
ffserver.conf
ffserver.texi
fftools-common-opts.texi
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
print_options.c
protocols.texi	Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'	2014-03-12 03:18:12 +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
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