Go to file
Michael Niedermayer 4cd066b69c Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'
* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
  movenc: K&R formatting cosmetics

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 04:08:07 +02:00
compat
doc
libavcodec zmbvenc: remove unused AVFrame from encoder private context 2013-07-07 23:50:54 +00:00
libavdevice
libavfilter
libavformat Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a' 2013-07-08 04:08:07 +02:00
libavresample
libavutil
libpostproc
libswresample
libswscale
presets
tests avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases 2013-07-08 02:37:24 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
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.