Michael Niedermayer 58770db2ae Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7' ... * commit '33018907bd07b34e0e70d5ae12097265eb3734d7': mp3enc: allow omitting the id3v2 header with -id3v2_version 0 Conflicts: doc/muxers.texi libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-01-17 15:34:24 +01:00
..
examples	examples/muxing: simplify video PTS setting	2014-01-12 09:25:48 +01:00
APIchanges	Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'	2014-01-05 22:12:41 +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
default.css
demuxers.texi
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
Doxyfile
encoders.texi
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
ffmpeg-scaler.texi
ffmpeg-utils.texi
ffmpeg.texi	doc/ffmpeg: remove documentation for removed vlang/slang options	2014-01-08 09:47:53 +01:00
ffmpeg.txt
ffplay.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +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	doc/ffserver: mention how to access streams through RTSP	2014-01-03 17:03:43 +01:00
fftools-common-opts.texi
filter_design.txt
filters.texi	lavfi/vidstabdetect,vidstabtransform: update to vid.stab 0.98	2014-01-16 12:23:48 +01:00
formats.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
general.texi	ATRAC3+ decoder	2014-01-09 19:33:07 +01:00
git-howto.texi
indevs.texi
issue_tracker.txt
libavcodec.texi
libavdevice.texi
libavfilter.texi
libavformat.texi
libavutil.texi
libswresample.texi
libswscale.texi
Makefile
metadata.texi
mips.txt
multithreading.txt
muxers.texi	Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'	2014-01-17 15:34:24 +01:00
nut.texi
optimization.txt
outdevs.texi
platform.texi
print_options.c
protocols.texi	doc/protocols/file: fix semantical reverse	2014-01-05 00:43:51 +01:00
rate_distortion.txt
RELEASE_NOTES
resampler.texi
scaler.texi
snow.txt
swresample.txt
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
texidep.pl
utils.texi