FFmpeg git repo
Go to file
Michael Niedermayer 2efc2b53be Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'
* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
  iff: Do not read over the source buffer

Conflicts:
	libavcodec/iff.c

See: 2fbb37b51b

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:32:36 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
doc lavf/segment: add initial_offset option 2013-07-11 00:36:24 +02:00
libavcodec Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a' 2013-07-11 11:12:48 +02:00
libavdevice avformat/AVFormatContext: Move fields down to match the fork 2013-07-09 19:06:32 +02:00
libavfilter lavfi/aevalsrc: do not free AVOption variables in uninit() 2013-07-10 19:22:07 +00:00
libavformat lavf/segment: use AV_OPT_TIME_DURATION for time_delta 2013-07-11 00:36:53 +02:00
libavresample
libavutil add crc24 tables 2013-07-10 12:07:53 +00:00
libpostproc
libswresample
libswscale swscale: treat gray as a fullrage (0-255) format 2013-07-08 15:21:48 +02:00
presets
tests fate: Always enable avresample 2013-07-10 15:12:05 -04:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add aecho filter 2013-07-10 12:10:58 +00:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: Update which releases are supported 2013-07-10 00:47:01 +02:00
Makefile
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
arch.mak
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
ffmpeg.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffmpeg.h
ffmpeg_filter.c ffmpeg_filter: replace exit() by exit_program() 2013-07-08 11:09:22 +02:00
ffmpeg_opt.c ffmpeg_opt: do not warn about unused gop_timecode 2013-07-09 10:54:40 +02:00
ffplay.c ffplay: assume 0 stream start time if start time is unset in duration check 2013-07-09 20:19:54 +02:00
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffserver.c
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.