FFmpeg git repo
Go to file
Michael Niedermayer 1c60956c80 Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft

Conflicts:
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:21:43 +01:00
compat
doc lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
libavcodec lavc: remove disabled 8SVX_RAW cruft 2013-03-13 11:17:09 +00:00
libavdevice bktr: add missing #include for av_gettime() 2013-03-13 10:48:09 +00:00
libavfilter lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
libavformat Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201' 2013-03-13 12:21:43 +01:00
libavresample
libavutil Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d' 2013-03-13 02:08:41 +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 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
cmdutils_common_opts.h
common.mak
configure mjpeg: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:59:10 +01:00
ffmpeg.c ffmpeg: remove unused variable 2013-03-12 18:58:10 +01:00
ffmpeg.h
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 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
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.