FFmpeg git repo
Go to file
Michael Niedermayer 857d7194ca Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: add a pointer for weighted prediction temporary buffer

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07 16:29:07 +01:00
compat
doc avcodec: Fix a typo in an option description 2012-12-07 16:16:20 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-12-07 16:29:07 +01:00
libavdevice lavd/lavfi: fix float.h include. 2012-12-06 15:09:47 +01:00
libavfilter Fix compilation with yasm 0.6.2. 2012-12-07 00:26:45 +01:00
libavformat Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333' 2012-12-07 15:52:43 +01:00
libavresample
libavutil Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152' 2012-12-07 15:21:41 +01:00
libpostproc
libswresample resample: remove disabled debug code 2012-12-06 02:51:26 +01:00
libswscale
presets
tests Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152' 2012-12-07 15:21:41 +01:00
tools
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Changelog: add an entry for deprecating the avconv -vol option 2012-12-06 11:33:38 -05:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6' 2012-12-05 15:58:07 +01:00
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-12-04 14:23:22 +01:00
ffmpeg.c ffmpeg: small indent fix. 2012-12-04 16:40:11 +01:00
ffmpeg.h
ffmpeg_filter.c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
library.mak
version.sh

README

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.