RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
b8a43bc1b5
ffmpeg/doc
History
Michael Niedermayer b8a43bc1b5 Merge remote-tracking branch 'qatar/master' into master 
* qatar/master: (27 commits)
  ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
  ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
  ac3dsp: fix loop condition in ac3_update_bap_counts_c()
  ARM: unbreak build
  ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
  ac3enc: split mantissa bit counting into a separate function.
  ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
  get_bits: add av_unused tag to cache variable
  sws: replace all long with int.
  ARM: aacdec: fix constraints on inline asm
  ARM: remove unnecessary volatile from inline asm
  ARM: add "cc" clobbers to inline asm where needed
  ARM: improve FASTDIV asm
  ac3enc: use LOCAL_ALIGNED macro
  APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
  lavu: add av_get_pix_fmt_name() convenience function
  cmdutils: remove OPT_FUNC2
  swscale: fix crash in bilinear scaling.
  vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
  webm: support stereo videos in matroska/webm muxer
  ...

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	doc/muxers.texi
	ffmpeg.c
	ffplay.c
	libavcodec/ac3enc.c
	libavcodec/ac3enc_float.c
	libavcodec/avcodec.h
	libavcodec/get_bits.h
	libavcodec/libvpxenc.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavformat/matroskaenc.c
	libavutil/avutil.h
	libswscale/rgb2rgb.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-29 03:34:35 +02:00
..
APIchanges Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
bitstream_filters.texi
build_system.txt
decoders.texi decoders.texi: fix typos in rawvideo section 2011-05-20 10:14:00 +02:00
demuxers.texi
developer.texi patch checklist: suggest --disable-yasm test. 2011-05-27 12:48:43 +02:00
encoders.texi doc: correct AC-3 option subsection placement 2011-05-29 00:32:26 +02:00
eval.texi eval: implement not() expression 2011-05-25 12:42:19 +02:00
faq.texi
fate.txt fate.txt: replace FATE rsync command with a make command 2011-05-27 10:41:46 +02:00
ffmpeg-mt-authorship.txt
ffmpeg.texi preset dir for win32 2011-05-21 03:36:26 +02:00
ffplay.texi doc: add decoders.texi file 2011-05-20 10:00:00 +02:00
ffprobe.texi doc: add decoders.texi file 2011-05-20 10:00:00 +02:00
ffserver.conf
ffserver.texi
fftools-common-opts.texi
filters.texi vf_mp: fix name of the remove-logo filter referenced in filters.texi 2011-05-25 18:29:55 +02:00
general.texi Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
git-howto.txt
indevs.texi
issue_tracker.txt doc:Partial update of our issue tracker doc. More work needed, volunteers welcome. 2011-05-09 04:13:55 +02:00
libavfilter.texi
metadata.texi
multithreading.txt
muxers.texi webm: support stereo videos in matroska/webm muxer 2011-05-28 12:15:55 +02:00
optimization.txt
outdevs.texi lavdev: add SDL output device 2011-05-28 19:17:14 +02:00
protocols.texi
rate_distortion.txt
snow.txt
soc.txt
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
TODO
viterbi.txt