RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/doc
History
Michael Niedermayer 568e9062bd Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 
* qatar/release/0.8: (154 commits)
  Update Changelog for the 0.8.1 Release
  dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
  dca: don't use av_clip_uintp2().
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  h264: increase reference poc list from 16 to 32.
  h264: stricter reference limit enforcement.
  h264: improve parsing of broken AVC SPS
  Replace computations of remaining bits with calls to get_bits_left().
  png: convert to bytestream2 API.
  roqvideo: convert to bytestream2 API.
  smc: port to bytestream2 API.
  tgq: convert to bytestream2 API.
  algmm: convert to bytestream2 API.
  jvdec: unbreak video decoding
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  avconv: reindent
  ...

Conflicts:
	Changelog
	RELEASE
	avconv.c
	doc/APIchanges
	ffplay.c
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/alsdec.c
	libavcodec/atrac3.c
	libavcodec/avcodec.h
	libavcodec/dvdata.c
	libavcodec/fraps.c
	libavcodec/golomb.h
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_direct.c
	libavcodec/h264_parser.c
	libavcodec/h264_ps.c
	libavcodec/h264idct_template.c
	libavcodec/indeo3.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/mjpegbdec.c
	libavcodec/mmvideo.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.h
	libavcodec/options.c
	libavcodec/pngdec.c
	libavcodec/roqvideodec.c
	libavcodec/shorten.c
	libavcodec/svq3.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavcodec/xxan.c
	libavformat/Makefile
	libavformat/asfdec.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/nsvdec.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h
	libswscale/swscale.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-03-16 09:01:08 +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/release/0.8' into release/0.10 2012-03-16 09:01:08 +01:00
Makefile doc: build: TEXIDEP: Recognize verbatim includes 2011-12-24 02:56:52 +01:00
RELEASE_NOTES RELEASE_NOTES: update for 0.10 2012-01-26 21:59:09 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
avutil.txt
…
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
…
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.texi doc/ffmpeg.texi 2012-01-25 23:01:34 +01:00
ffmpeg.txt
…
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
…
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
…
libavfilter.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
metadata.texi
…
multithreading.txt
…
muxers.texi Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
optimization.txt
…
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
…
snow.txt
…
soc.txt Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swresample.txt
…
swscale.txt
…
t2h.init Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
tablegen.txt
…
texi2pod.pl
…
viterbi.txt
…