FFmpeg git repo
Go to file
Michael Niedermayer 5ded4332f1 Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'
* commit '14abeaa43d021afdce9119d906891abe89c03b88':
  build: Separate building programs linking against libav* from building av*

Conflicts:
	Makefile
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26 01:12:24 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-24 23:27:32 +01:00
doc Merge commit '14abeaa43d021afdce9119d906891abe89c03b88' 2013-11-26 01:12:24 +01:00
libavcodec avcodec/ac3dec: check bap before use. 2013-11-25 23:17:17 +01:00
libavdevice lavd/sdl: do not manually free window_title and icon_title fields 2013-11-24 19:35:36 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
libavformat lavf/segment: add a few log messages when avio_open2() fails 2013-11-25 19:20:11 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
libpostproc
libswresample
libswscale Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949' 2013-11-23 12:10:40 +01:00
presets
tests Merge commit '874838dc6589d978611c89a40694a5074f892a76' 2013-11-21 18:49:41 +01:00
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore
arch.mak
Changelog Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
cmdutils_common_opts.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
cmdutils.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
common.mak Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' 2013-11-15 12:19:45 +01:00
configure Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'" 2013-11-25 01:53:12 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg.h Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: do not call avcodec_register_all() explicitly 2013-11-25 00:03:20 +01:00
ffprobe.c ffprobe: add support for subtitle frames 2013-11-25 19:51:27 +01:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile Merge commit '14abeaa43d021afdce9119d906891abe89c03b88' 2013-11-26 01:12:24 +01: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.