FFmpeg git repo
Go to file
Michael Niedermayer b5bdd04f08 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aac: K&R formatting cosmetics

Conflicts:
	libavformat/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 12:00:45 +01:00
compat
doc Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
libavcodec avcodec/libx265: fill headers in extradata 2014-03-14 04:26:24 +01:00
libavdevice
libavfilter
libavformat Merge remote-tracking branch 'qatar/master' 2014-03-14 12:00:45 +01:00
libavresample
libavutil Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87' 2014-03-14 01:56:25 +01:00
libpostproc
libswresample
libswscale Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87' 2014-03-14 01:56:25 +01:00
presets
tests
tools
.gitignore
arch.mak Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
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.