Go to file
Michael Niedermayer 3a05d7a9e5 Merge commit '390acbea0697a60300f249602dbf701e04274693'
* commit '390acbea0697a60300f249602dbf701e04274693':
  configure: Provide --pkg-config-flags

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 02:22:16 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge remote-tracking branch 'qatar/master' 2014-03-11 21:24:54 +01:00
libavcodec avcodec/vorbisdec: use the stored previous window type only when the actual previous is not known 2014-03-11 20:45:29 +01:00
libavdevice Merge remote-tracking branch 'cigaes/master' 2014-03-08 15:00:36 +01:00
libavfilter lavfi/af_atempo: clear references before returning error. 2014-03-08 12:31:00 +01:00
libavformat Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf' 2014-03-12 02:11:47 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2014-03-09 15:37:35 +01:00
libpostproc
libswresample
libswscale
presets
tests Add fieldmatch test 2014-03-10 02:59:01 +01:00
tools
.gitignore
arch.mak
Changelog lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '390acbea0697a60300f249602dbf701e04274693' 2014-03-12 02:22:16 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
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.