Go to file
Michael Niedermayer dcb0d1193a Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'
* commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45':
  atrac3: use AVCodecContext.channels instead of keeping a private copy
  atrac3: simplify some loop indexing
  atrac3: cosmetics: pretty-printing and renaming
  pcm: define AVCodec instances only for enabled codecs
  libxvid: remove useless doxy comments.
  lavc: remove stats_out from the options table.

Conflicts:
	libavcodec/atrac3.c
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 12:36:16 +02:00
compat compat/getopt: add {} to complex ifs 2012-10-21 18:05:22 +02:00
doc LVF demuxer 2012-10-22 23:22:39 +00:00
libavcodec Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45' 2012-10-23 12:36:16 +02:00
libavdevice lavc: add lavfi metadata support. 2012-10-21 17:29:10 +02:00
libavfilter vf_aspect: unbreak avoption system 2012-10-22 13:12:15 +02:00
libavformat LVF demuxer 2012-10-22 23:22:39 +00:00
libavresample Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
libavutil Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4' 2012-10-22 14:39:12 +02:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swresample: include ff_log2_tab for shared builds 2012-10-20 01:58:04 +02:00
libswscale Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate/mapchan: add bitexact flag 2012-10-23 02:19:38 +02:00
tools qt-faststart: check fseeko() return codes 2012-10-22 22:42:51 +02:00
.gitignore Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed' 2012-10-20 12:37:52 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog LVF demuxer 2012-10-22 23:22:39 +00:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c cmdutils: apply option to codec and format contexts if possible. 2012-10-22 22:24:23 +02:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
COPYING.GPLv2
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
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c ffmpeg: fix negative array index 2012-10-22 13:58:19 +02:00
ffmpeg_opt.c Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' 2012-10-17 14:30:25 +02:00
ffmpeg.c ffmpeg: check avpicture_get_size() retuen value 2012-10-23 00:22:23 +02:00
ffmpeg.h ffmpeg: Make video filter graph reinit user selectable 2012-10-17 00:06:12 +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: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c ffm_read_write_index: check lseek return code 2012-10-17 20:35:16 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +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-16 14:15:16 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE prepare 9_beta1 release 2012-10-11 18:36:40 +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.