FFmpeg git repo
Go to file
Michael Niedermayer d469fa1923 Merge commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452'
* commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452':
  lavc: remove disabled FF_API_VDA_ASYNC cruft

Conflicts:
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 01:14:09 +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 'adfa53d67c7a3318157ea9d95e8bdcfb77139452' 2013-03-13 01:14:09 +01:00
libavdevice Remove references to the "ff" variant of buffersink. 2013-03-12 23:31:07 +01:00
libavfilter lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +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
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
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
Changelog Changelog: fix project name 2013-03-12 21:45:51 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: improve feedback in case of not found option 2013-03-13 00:34:29 +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 configure: remove selection of ff(a)buffersink. 2013-03-12 23:31:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
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 Remove references to the "ff" variant of buffersink. 2013-03-12 23:31:07 +01:00
ffprobe.c ffprobe: support codec options 2013-03-13 00:34:36 +01:00
ffserver.c Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9' 2013-03-12 14:27:54 +01:00
INSTALL
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
RELEASE
version.sh

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.