Go to file
Michael Niedermayer 8943ad4014 Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
  avio: fix pointer type mismatches in avio_enum_protocols()
  avserver: use socklen_t where appropriate
  udp: use socklen_t where appropriate
  network: use HAVE_THREADS instead of local hack
  af_channelmap: remove stray enum declaration
  buffersink: remove stray semicolon after function definition

Conflicts:
	libavformat/avio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28 13:19:11 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc lavfi/concat: implement unsafe mode. 2012-10-28 09:14:34 +01:00
libavcodec lpc: check that lpc_type is valid in ff_lpc_calc_coefs 2012-10-28 03:27:16 +01:00
libavdevice lavd/lavfi: fix leak in case of failure 2012-10-25 21:35:40 +02:00
libavfilter Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
libavformat Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
libavresample Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
libavutil lavu: add more doxy to av_rescale_delta 2012-10-27 02:58:09 +02:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swr: use 64bit index/len for x86_64 mix 2012-10-28 02:09:08 +02:00
libswscale sws: rgb has no range, avoid random results if the user tries to mess with it anyway. 2012-10-28 02:46:56 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: make sure the global sws flags are set to be bitexact for scalenorm 2012-10-28 13:05:35 +01:00
tools cws2fws: check fstat return code. 2012-10-26 18:24:50 +02:00
.gitignore tools: add ffescape utility 2012-10-25 23:56:16 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog caf muxer: write metadata 2012-10-26 03:12:45 +00:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c cmdutils: fix unclosed file on error 2012-10-25 00:32:34 +02:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-10-26 15:20:48 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-10-27 15:02:35 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
ffmpeg_filter.c ffmpeg: fix negative array index 2012-10-22 13:58:19 +02:00
ffmpeg_opt.c ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffmpeg.c ffmpeg: use av_rescale_delta() for audio stream copy 2012-10-27 04:01:31 +02:00
ffmpeg.h ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffplay.c ffplay: if there is no audio stream, use external clock by default 2012-10-21 17:18:12 +02:00
ffprobe.c ffprobe: add an array of section print buffers to the WriterContext 2012-10-24 23:40:21 +02:00
ffserver.c Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' 2012-10-24 12:53:26 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS add dshow maintainer 2012-10-12 19:52:05 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-10-26 15:20:48 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +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.