FFmpeg/doc
Michael Niedermayer 653d117c29 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libschroedinger: Switch to function names more in line with Libav style.
  Move code shared between libdirac and libschroedinger to libschroedinger.
  lavfi: uninline avfilter_copy_buffer_ref_props().
  lavf: add missing '*' in a doxy.
  h264: Remove a commented-out function pointer typedef.
  txd: Remove write-only variable in txd_decode_frame().
  mmvideo.c: Remove unused variable in mm_decode_pal().
  build: cosmetics: Add missing end-of-line backslashes to item lists.
  build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
  libschroedinger: Move a function to avoid a forward declaration.
  pthread: warn on high thread counts
  vf_yadif: fix missing error handling for avfilter_poll_frame()
  avprobe: allow showing only one container/stream property.
  lavfi: support audio in avfilter_copy_frame_props().
  lavfi: avfilter_merge_formats: handle case where inputs are same
  lavc: add sample rate and channel layout to AVFrame.
  zerocodec: check if the previous frame is missing
  doc: clarify check for NULL pointer style

Conflicts:
	doc/APIchanges
	doc/developer.texi
	ffprobe.c
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/libdirac_libschro.c
	libavcodec/libdirac_libschro.h
	libavcodec/mmvideo.c
	libavcodec/txd.c
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/version.h
	libavformat/Makefile
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:51:34 +02:00
..
doxy doxygen: cleanup style to support older doxy 2011-12-29 17:19:46 +01:00
examples examples/filtering_audio: use av_buffersrc_add_frame. 2012-05-04 23:26:41 +02:00
APIchanges lavc: add sample rate and channel layout to AVFrame. 2012-05-07 07:08:03 +02:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
avutil.txt
bitstream_filters.texi Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
build_system.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
decoders.texi
demuxers.texi
developer.texi doc: clarify check for NULL pointer style 2012-05-06 15:47:10 -07:00
encoders.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
errno.txt
eval.texi eval: add root() to solve f(x)=0 2012-02-27 00:00:55 +01:00
faq.texi faq: fix typo. 2012-01-24 16:03:09 +01:00
fate.texi Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi doc: fix syntax for durations and timestamps. 2012-04-27 11:04:51 +02:00
ffmpeg.txt Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
ffplay.texi
ffprobe.texi Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
ffprobe.xsd ffprobe: report bit rate in stream description 2012-02-20 17:46:26 +01:00
ffserver.conf Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
ffserver.texi
filters.texi Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
general.texi JACOsub demuxer, decoder and muxer. 2012-05-03 19:37:14 +02:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
git-howto.txt
indevs.texi v4l2: allow to convert monotonic timestamps. 2012-04-04 15:22:44 +02:00
issue_tracker.txt
libavfilter.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
metadata.texi
multithreading.txt
muxers.texi doc/muxers: add documentation for the md5 and framemd5 muxers 2012-04-07 13:57:40 +02:00
optimization.txt
outdevs.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
platform.texi Merge remote-tracking branch 'qatar/master' 2012-04-24 02:30:41 +02:00
print_options.c print_options: warn that the files are generated. 2012-04-23 18:14:25 +02:00
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
rate_distortion.txt
RELEASE_NOTES RELEASE_NOTES: update for 0.10 2012-01-26 21:59:09 +01:00
snow.txt
soc.txt
swresample.txt cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
swscale.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
t2h.init
tablegen.txt
texi2pod.pl doc: texi2pod: add -I flag 2012-03-20 11:10:25 +00:00
viterbi.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00