FFmpeg git repo
Go to file
Michael Niedermayer 620c6292b1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: Fix Ogg demuxer dependencies
  build: Fix FLAC demuxer dependencies
  flac: Move flac functions shared between libraries to flac common code
  build: Fix CAF demuxer dependencies
  build: Fix MP2 muxer dependencies
  build: Add missing build rules for the ISMV muxer
  configure: Drop redundant mxf_d10 test dependency declaration
  Support AAC encoding via the external library fdk-aac
  libavcodec: Add more AAC profiles
  dct/fft-test: use a replacement getopt() if the system has none present.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-12 23:57:00 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
libavdevice
libavfilter lavfi/movie: reindent after the previous patch 2012-07-10 01:37:54 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
libavresample
libavutil av_samples_copy: support overlapping copies 2012-07-12 22:25:25 +02:00
libpostproc
libswresample
libswscale
mt-work
presets
tests fate: add test for paf demuxer 2012-07-10 00:04:24 +00:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
ffmpeg.c add output for frame timestamps 2012-07-12 20:18:03 +02:00
ffplay.c
ffprobe.c
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.