FFmpeg git repo
Go to file
Michael Niedermayer e664f48b97 Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a'
* commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a':
  lavc: remove disabled FF_API_CODEC_ID cruft

Conflicts:
	libavcodec/old_codec_ids.h
	libavcodec/version.h

Only the #define is removed
The CODEC_IDs itself are left until theres some reason to remove
them.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 00:49:25 +01:00
compat
doc lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
libavcodec Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a' 2013-03-13 00:49:25 +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
libavutil Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51' 2013-03-12 21:39:38 +01:00
libpostproc
libswresample
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
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Changelog: fix project name 2013-03-12 21:45:51 +01:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
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
cmdutils_common_opts.h
common.mak
configure configure: remove selection of ff(a)buffersink. 2013-03-12 23:31:07 +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 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
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
library.mak
version.sh

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.