FFmpeg git repo
Go to file
Michael Niedermayer 7fad19a63d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: cabac: replace explicit memory references with "m" operands
  avplay: don't request a stereo downmix
  wmapro: use av_float2int()
  lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
  lavu: replace int/float punning functions
  lavfi: install libavfilter/vsrc_buffer.h
  Remove extraneous semicolons
  sdp: Restore the original mp4 format h264 extradata if converted
  rtpenc: Add support for mp4 format h264
  rtpenc: Simplify code by introducing a separate end pointer
  movenc: Use the actual converted sample for RTP hinting
  Fix a bunch of common typos.

Conflicts:
	doc/developer.texi
	doc/eval.texi
	doc/filters.texi
	doc/protocols.texi
	ffmpeg.c
	ffplay.c
	libavcodec/mpegvideo.h
	libavcodec/x86/cabac.h
	libavfilter/Makefile
	libavformat/avformat.h
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/gxfenc.c
	libavformat/img2.c
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/rtpenc_h264.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 01:25:37 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
libavfilter life: add mold, mold_color, life_color and death_color options. 2011-12-11 14:14:01 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
libswresample swr-test: drop one const, silence most const qualifer warnings. 2011-12-03 00:46:46 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests seektest: floatfree 2011-12-11 19:21:39 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
Changelog lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
cmdutils_common_opts.h fftools: add -report option. 2011-12-10 16:40:03 +01:00
cmdutils.c fftools: add -report option. 2011-12-10 16:40:03 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Add coverage support. 2011-12-05 20:04:48 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X 2011-12-11 03:00:30 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
ffprobe.c ffprobe: print codec timecode if available. 2011-11-28 14:06:02 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: extend syntax for entries 2011-12-11 03:05:37 +01:00
Makefile Makefile: disable compiling avconv by default. 2011-12-10 04:46:20 +01:00
README
RELEASE RELEASE: We're now at 0.8.7.git 2011-11-25 14:37:35 +01:00
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.