FFmpeg git repo
Go to file
Michael Niedermayer 70737b83f0 Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'
* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
  oggparsetheora: K&R cosmetics, reformat

Conflicts:
	libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:26:00 +01:00
compat
doc lavc: extend documentation for the "bf" option 2013-10-29 18:30:27 +01:00
libavcodec Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9' 2013-10-30 10:23:24 +01:00
libavdevice timefilter: Handle memory allocation failure 2013-10-29 11:40:04 +00:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
libavformat Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68' 2013-10-30 10:26:00 +01:00
libavresample Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 2013-10-28 09:59:53 +01:00
libavutil avutil/opt: fix flags check on non x86 2013-10-29 21:07:45 +01:00
libpostproc
libswresample
libswscale
presets
tests tests/fate: fix fate on branches different from origin/master 2013-10-29 21:53:59 +01:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Changelog: add 2.1 2013-10-28 00:39:34 +01:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: update which releases i maintain 2013-10-28 00:40:15 +01:00
Makefile
README
RELEASE
arch.mak
cmdutils.c cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils.h cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils_common_opts.h
common.mak
configure Merge commit 'e78913052263af80855590659fb0f705e8f13c8a' 2013-10-29 19:50:03 +01:00
ffmpeg.c Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 2013-10-29 21:38:53 +01:00
ffmpeg.h Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 2013-10-29 21:38:53 +01:00
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
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.