generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ffmpeg/doc
History
Michael Niedermayer e37f161e66 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 07:53:34 +01:00
..
doxy
doxygen: cleanup style to support older doxy
2011-12-29 17:19:46 +01:00
examples
decoding example: reset pts/dts after subpacket.
2011-12-13 19:47:57 +01:00
APIchanges
Merge remote-tracking branch 'qatar/master'
2012-01-28 07:53:34 +01:00
avtools-common-opts.texi
Merge remote-tracking branch 'qatar/master'
2012-01-12 01:10:32 +01:00
avutil.txt
Remove unused softfloat implementation.
2011-05-11 13:43:30 +02:00
bitstream_filters.texi
doc/bistream_filters.texi: add documentation for the h264_mp4toannexb filter
2012-01-14 12:36:41 +01:00
build_system.txt
Revert some silly renamings that leaked in from a pull.
2011-03-29 02:27:13 +02:00
decoders.texi
lavc: add ffwavesynth pseudo-codec.
2011-12-15 18:38:04 +01:00
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
doc: use @command{} for commands.
2012-01-04 13:21:08 +01:00
errno.txt
doc: add a list of errno codes on some systems.
2011-12-21 19:59:45 +01:00
eval.texi
doc/eval.texi: add precisation about the assumption for "trueness" in conditional expressions
2012-01-17 12:03:30 +01:00
faq.texi
faq: fix typo.
2012-01-24 16:03:09 +01:00
fate.texi
doc: fate: Move documentation from .txt to .texi
2011-12-20 16:05:01 +01:00
ffmpeg-mt-authorship.txt
Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.
2011-04-19 01:17:59 +02:00
ffmpeg.texi
doc/ffmpeg.texi
2012-01-25 23:01:34 +01:00
ffmpeg.txt
doc: small ascii diagram on I/O files and streams in ffmpeg.c
2011-10-12 15:43:52 +02:00
ffplay.texi
ffplay: add 10 minute seek support to ffplay
2011-12-14 21:09:08 +01:00
ffprobe.texi
doc: remove trailing 's' to metadata.
2012-01-26 13:06:22 +01:00
ffprobe.xsd
ffprobe: add support to audio frame information printing
2012-01-12 17:34:16 +01:00
ffserver.conf
Rename ffserver to avserver.
2011-08-09 19:56:25 +02:00
ffserver.texi
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
filters.texi
pan: add channel mapping capability.
2012-01-24 10:43:41 +01:00
general.texi
r210, r10k and avrp encoder
2012-01-25 23:40:06 +01:00
git-howto.texi
Merge remote-tracking branch 'qatar/master'
2011-12-10 02:01:03 +01:00
git-howto.txt
githowto: git is generally available as package in most distros.
2011-11-23 23:03:37 +01:00
indevs.texi
Merge remote-tracking branch 'qatar/master'
2012-01-05 02:03:12 +01:00
issue_tracker.txt
doc: issue tracking: explain the term issue
2011-09-02 23:08:03 +02:00
libavfilter.texi
doc: use @command{} for commands.
2012-01-04 13:21:08 +01:00
Makefile
doc: build: TEXIDEP: Recognize verbatim includes
2011-12-24 02:56:52 +01:00
metadata.texi
Revert "replace FFmpeg with Libav in doc/"
2011-03-17 17:26:45 +01:00
multithreading.txt
Revert "replace FFmpeg with Libav in doc/"
2011-03-17 17:26:45 +01:00
muxers.texi
Merge remote-tracking branch 'qatar/master'
2011-12-20 04:12:09 +01:00
optimization.txt
fix another forgotten mplayerhq.hu link
2011-04-08 01:35:43 +02:00
outdevs.texi
doc: use @command{} for commands.
2012-01-04 13:21:08 +01:00
platform.texi
Fix a bunch of platform name and other typos.
2012-01-11 13:48:30 +01:00
protocols.texi
doc: use @command{} for commands.
2012-01-04 13:21:08 +01:00
rate_distortion.txt
The definition of rate and distortion is not conditional of lambda being
2009-03-30 10:39:20 +00:00
RELEASE_NOTES
RELEASE_NOTES: update for 0.10
2012-01-26 21:59:09 +01:00
snow.txt
Use a consistent capitalization for 'Snow' as discussed on the list
2008-02-08 19:17:46 +00:00
soc.txt
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
swresample.txt
swr-docs: update due to last change to swresample
2011-10-06 00:32:01 +02:00
swscale.txt
Update SW scaler doc after libswscale commit 30841.
2010-03-05 08:34:31 +00:00
t2h.init
Merge remote-tracking branch 'qatar/master'
2011-12-10 02:01:03 +01:00
tablegen.txt
Update tablegen documentation for WRITE_ARRAY macro.
2010-06-27 14:31:50 +00:00
texi2pod.pl
doc: replace @pxref by @ref where appropriate
2011-07-09 21:53:59 +02:00
viterbi.txt
Quick description of the Viterbi algorithm so I do not have to repeat it
2009-03-03 15:35:20 +00:00