FFmpeg git repo
Go to file
Michael Niedermayer c4a696fb54 Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'
* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
  avcodec: Stop exporting the removed audio_resample* symbols

Conflicts:
	libavcodec/libavcodec.v

Not merged as theres no pressing need to remove it now.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 13:17:12 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc lavfi/mp: remove mp=fil 2013-09-05 20:22:47 +00:00
libavcodec Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29' 2013-09-06 13:00:47 +02:00
libavdevice Read h264 headers from v4l2 to allow stream-copying. 2013-09-01 21:27:43 +02:00
libavfilter lavfi/mp: remove mp=fil 2013-09-05 20:22:47 +00:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-09-05 13:34:37 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil Merge commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b' 2013-09-06 12:21:16 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 2013-08-20 16:56:51 +02:00
libswscale Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
presets
tests fate: Force diff into text mode 2013-09-04 01:02:06 +02:00
tools tools/crypto_bench: fix 2 typos. 2013-09-04 21:59:34 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: port phase filter from libmpcodecs 2013-09-03 14:05:38 +00:00
INSTALL
LICENSE lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
MAINTAINERS MAINTAINERS: Add my GPG fingerprint 2013-08-23 21:40:57 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
arch.mak
cmdutils.c cmdutils: silence warning about incompatible pointer types 2013-08-30 12:41:36 +00:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
cmdutils_common_opts.h
common.mak
configure Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d' 2013-09-04 13:15:22 +02:00
ffmpeg.c Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding. 2013-08-18 22:00:35 +02:00
ffmpeg.h Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg_filter.c ffmpeg_filter: check that the input media type match the filter 2013-08-14 03:03:41 +02:00
ffmpeg_opt.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffplay.c ffplay: make next_nb_channels[] static const 2013-08-24 19:53:11 +02:00
ffprobe.c ffprobe: show bitmap subtitles size. 2013-09-04 16:36:28 +02:00
ffserver.c ffserver: allocate rc_eq, prevent freeing invalid pointer 2013-08-13 15:24:30 +02:00
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.