Go to file
Michael Niedermayer 849f015406 Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'
* commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480':
  Add informative messages to av_log_ask_for_sample calls lacking them
  anm: Get rid of some very silly goto statements

Conflicts:
	libavformat/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 14:03:22 +01:00
compat compat/strtod: isspace -> av_isspace. 2013-03-04 03:37:36 +01:00
doc lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
libavcodec Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480' 2013-03-13 14:03:22 +01:00
libavdevice bktr: add missing #include for av_gettime() 2013-03-13 10:48:09 +00:00
libavfilter Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536' 2013-03-13 13:34:06 +01:00
libavformat Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480' 2013-03-13 14:03:22 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil avframe: Copy buffer type in copy_props. 2013-03-13 13:05:42 +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
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog Changelog: fix project name 2013-03-12 21:45:51 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c opt: re-enable memleak fix for duplicated options. 2013-03-13 07:25:16 +01:00
cmdutils.h Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38' 2013-03-12 18:10:35 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure mjpeg: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:59:10 +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_filter.c Remove references to the "ff" variant of buffersink. 2013-03-12 23:31:07 +01:00
ffmpeg_opt.c Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30' 2013-03-12 21:34:24 +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
ffplay.c Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4' 2013-03-13 01:31:46 +01:00
ffprobe.c ffprobe: support codec options 2013-03-13 00:34:36 +01:00
ffserver.c opt: re-enable memleak fix for duplicated options. 2013-03-13 07:25:16 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01: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
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.