FFmpeg git repo
Go to file
Michael Niedermayer 67d7ea9825 Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'
* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
  vf_lut: Constantize

Conflicts:
	libavfilter/vf_lut.c

See: d7e95ccd9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-01 13:10:07 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc ffprobe: show probe_score in the format section 2013-09-01 11:34:18 +02:00
libavcodec avcodec/pcm-dvd: discard buffer if block size changed 2013-09-01 13:00:39 +02:00
libavdevice Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavfilter Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce' 2013-09-01 13:10:07 +02:00
libavformat Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9' 2013-09-01 13:00:08 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil lavu/bprint: add append buffer function 2013-08-30 22:36:38 +02:00
libpostproc
libswresample
libswscale Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
presets
tests fate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the format section 2013-09-01 12:53:24 +02:00
tools Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c cmdutils: silence warning about incompatible pointer types 2013-08-30 12:41:36 +00:00
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '84146963d23d76b09af633e97413cd97d9b3021e' 2013-08-29 13:52:09 +02:00
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c ffplay: make next_nb_channels[] static const 2013-08-24 19:53:11 +02:00
ffprobe.c ffprobe: show probe_score in the format section 2013-09-01 11:34:18 +02:00
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.