No description
Find a file
Michael Niedermayer f67ec7f3a2 Merge commit '0eeeb9647e'
* commit '0eeeb9647e':
  mpegaudiodec: Consistently handle fixed/float templating

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 05:12:07 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-07 23:39:31 +01:00
doc Merge commit 'f187557ab4' 2013-11-24 04:55:35 +01:00
libavcodec Merge commit '0eeeb9647e' 2013-11-24 05:12:07 +01:00
libavdevice lavd/xv: free resources on errors 2013-11-15 09:56:58 +01:00
libavfilter lavfi/aevalsrc: initialize pointer to expression to NULL 2013-11-21 23:14:38 +01:00
libavformat avformat/hnm: check chunk_size == 0 2013-11-22 23:52:08 +01:00
libavresample Merge commit '211ca69b13' 2013-10-28 09:59:53 +01:00
libavutil avutil/utf8: put under #ifdef TEST 2013-11-22 17:16:11 +01: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 lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale Merge commit 'c16bfb147d' 2013-11-23 12:10:40 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '874838dc65' 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 doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
Changelog Merge commit '7671dd7cd7' 2013-11-23 14:46:48 +01:00
cmdutils.c cmdutils&ffmpeg: use av_fopen_utf8() for passlogfile 2013-11-21 18:27:46 +01:00
cmdutils.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
cmdutils_common_opts.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
common.mak Merge commit 'e8fcdebb17' 2013-11-15 12:19:45 +01:00
configure Merge commit 'f187557ab4' 2013-11-24 04:55:35 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg.c Merge commit '07fd0a2219' 2013-11-23 14:31:15 +01:00
ffmpeg.h Merge commit '7671dd7cd7' 2013-11-23 14:46:48 +01:00
ffmpeg_filter.c Merge commit '07fd0a2219' 2013-11-23 14:31:15 +01:00
ffmpeg_opt.c Merge commit '7671dd7cd7' 2013-11-23 14:46:48 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7' 2013-11-23 14:46:48 +01:00
ffplay.c Merge commit '5b9c3b4505' 2013-11-16 23:54:10 +01:00
ffprobe.c ffprobe: use designated initializer for AVClass 2013-11-23 22:23:52 +00:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile Merge commit '7671dd7cd7' 2013-11-23 14:46:48 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.