FFmpeg git repo
Go to file
Michael Niedermayer 0724b4a16d Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'
* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
  h264: Integrate clear_blocks calls with IDCT

Conflicts:
	libavcodec/arm/h264idct_neon.S
	libavcodec/h264idct_template.c
	libavcodec/x86/h264_idct.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 11:53:19 +02:00
compat
doc Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d' 2013-04-11 11:20:55 +02:00
libavcodec Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f' 2013-04-11 11:53:19 +02:00
libavdevice
libavfilter Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d' 2013-04-11 11:20:55 +02:00
libavformat lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
libavresample
libavutil avutil/opencl: add opencl device list APIs 20130411 2013-04-11 03:48:57 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample
libswscale Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
presets
tests Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a' 2013-04-11 02:10:12 +02:00
tools Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d' 2013-04-11 11:20:55 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
ffmpeg.c ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
ffmpeg.h ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffplay.c ffplay: simplify video pts calculation 2013-04-08 22:21:45 +02:00
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.