Go to file
Michael Niedermayer fe40a9f98f Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'
* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
  Move get_logical_cpus() from lavc/pthread to lavu/cpu.

Conflicts:
	doc/APIchanges
	libavcodec/pthread.c
	libavutil/cpu.c
	libavutil/cpu.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 13:24:28 +02:00
compat Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
doc Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675' 2013-05-24 13:24:28 +02:00
libavcodec Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675' 2013-05-24 13:24:28 +02:00
libavdevice v4l2: make possible to disable libv4l2 at runtime. 2013-05-22 19:49:29 +02:00
libavfilter lavfi/testsrc: make nb_decimals available only in testsrc. 2013-05-23 17:22:05 +02:00
libavformat Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675' 2013-05-24 13:24:28 +02:00
libpostproc postproc/postprocess_template: remove empty comments 2013-05-23 14:39:58 +02:00
libswresample
libswscale add YUVJ411P 2013-05-21 12:56:11 +02:00
presets
tests Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68' 2013-05-24 12:15:56 +02:00
tools tools/patcheck: fix misdetection with stuff like const_names 2013-05-23 19:11:28 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak
Changelog Changelog: add entry for the S302m encoder 2013-05-24 04:42:32 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: show timeline support in -filters listing 2013-05-19 19:55:15 +02:00
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-05-22 10:57:46 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c
ffmpeg.c ffmpeg: free threads on error conditions. 2013-05-15 01:28:59 +02:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c ffserver: replace atoll() by strtoll() 2013-05-19 11:13:07 +02:00
INSTALL
library.mak
LICENSE lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
MAINTAINERS Support playing SMV files. 2013-05-22 15:20:22 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README
RELEASE
version.sh

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.