FFmpeg git repo
Go to file
Michael Niedermayer 1f27053b91 Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
  lavc: remove disabled FF_API_LIBMPEG2 cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 02:56:33 +01:00
compat
doc lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
libavcodec Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f' 2013-03-13 02:56:33 +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 'd6d369bf1370999896500ae7eb5b9447ab635a3d' 2013-03-13 02:08:41 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30' 2013-03-12 21:34:24 +01:00
tools
.gitignore
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
common.mak
configure Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4' 2013-03-13 01:31:46 +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
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
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
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.