ffmpeg/doc
Michael Niedermayer 484e59a0a0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avs: call release_buffer() at the end.
  Add minor bumps and APIchanges entries for lavc/lavfi changes.
  mpegvideo.c: K&R formatting and cosmetics.
  avconv: avoid memcpy in vsrc_buffer when possible.
  avconv: implement get_buffer()/release_buffer().
  lavfi: add a new function av_buffersrc_buffer().
  lavfi: add avfilter_copy_frame_props()
  lavc: add format field to AVFrame
  lavc: add width and height fields to AVFrame
  lavc: add a sample_aspect_ratio field to AVFrame
  doxy: add website-alike style to the html output
  FAQ: add an entry for common error when using -profile

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpegvideo.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/src_movie.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-26 04:10:47 +01:00
..
doxy doxy: add website-alike style to the html output 2011-12-25 14:34:32 +01:00
examples
APIchanges Add minor bumps and APIchanges entries for lavc/lavfi changes. 2011-12-25 20:50:16 +01:00
Makefile doc: build: TEXIDEP: Recognize verbatim includes 2011-12-24 02:56:52 +01:00
RELEASE_NOTES release_notes: merge back changes from our 0.9 to master 2011-12-24 01:13:46 +01:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-12-17 02:18:16 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-12-17 02:18:16 +01:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi lavf: add SBG demuxer. 2011-12-15 18:38:06 +01:00
developer.texi doc: make developer.texi point to correct fate doc 2011-12-20 18:12:36 +01:00
encoders.texi
errno.txt doc: add a list of errno codes on some systems. 2011-12-21 19:59:45 +01:00
eval.texi
faq.texi Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
fate.texi doc: fate: Move documentation from .txt to .texi 2011-12-20 16:05:01 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi Clearer explanation of audio channel mapping restrictions 2011-12-22 00:05:47 +01:00
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffserver.conf
ffserver.texi
filters.texi drawtext: allow burning the timecode. 2011-12-12 17:49:34 +01:00
general.texi lavf: Add SMJPEG demuxer. 2011-12-22 04:12:45 +01:00
git-howto.texi
git-howto.txt
indevs.texi
issue_tracker.txt
libavfilter.texi
metadata.texi
multithreading.txt
muxers.texi Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
optimization.txt
outdevs.texi
platform.texi platform.texi: close @enumerate section in the "Using shared libraries" subsection 2011-12-22 11:08:16 +01:00
protocols.texi
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt