Go to file
Michael Niedermayer 0d0f76ea56 Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'
* commit '6327c10702922eabcb1c6170abd3f03d23ce4c51':
  atomic: fix CAS with armcc.
  png: use av_mallocz_array() for the zlib zalloc function
  libmp3lame: use the correct remaining buffer size when flushing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:39:38 +01:00
compat compat/strtod: isspace -> av_isspace. 2013-03-04 03:37:36 +01:00
doc Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38' 2013-03-12 18:10:35 +01:00
libavcodec Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51' 2013-03-12 21:39:38 +01:00
libavdevice lavd/v4l2: fix bug in init_convert_timestamp() 2013-03-12 17:14:47 +01:00
libavfilter avfilter: remove unused variable 2013-03-12 21:23:54 +01:00
libavformat avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well 2013-03-12 20:06:31 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51' 2013-03-12 21:39:38 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample buildsys: only include log2_tab per library for shared builds 2013-03-04 12:25:02 +01:00
libswscale Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' 2013-03-12 15:44:15 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30' 2013-03-12 21:34:24 +01:00
tools lavu: add escape API 2013-03-07 01:12:04 +01:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01: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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
Changelog Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30' 2013-03-12 21:34:24 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE lavfi: port MP stereo3d filter 2013-03-05 18:36:40 +00:00
MAINTAINERS MAINTAINERS: update for 1.2 2013-03-08 14:45:26 +01:00
Makefile build: Add proper infrastructure for adding and checking host CPPFLAGS 2013-02-23 20:23:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
cmdutils.c Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38' 2013-03-12 18:10:35 +01:00
cmdutils.h Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38' 2013-03-12 18:10:35 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure dsputil: make selectable. 2013-03-12 19:56:58 +01:00
ffmpeg.c ffmpeg: remove unused variable 2013-03-12 18:58:10 +01:00
ffmpeg.h Merge commit '354468fc12dcf93e7fb4af552e18906771913273' 2013-03-12 14:16:02 +01:00
ffmpeg_filter.c ffmpeg: port sub2video to AVFrame. 2013-03-10 13:45:15 +01:00
ffmpeg_opt.c Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30' 2013-03-12 21:34:24 +01:00
ffplay.c Merge commit '354468fc12dcf93e7fb4af552e18906771913273' 2013-03-12 14:16:02 +01:00
ffprobe.c ffprobe: use AVFrame accessor functions 2013-03-01 23:18:22 +01:00
ffserver.c Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9' 2013-03-12 14:27:54 +01:00
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README

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.