FFmpeg git repo
Go to file
Michael Niedermayer 3194ab78a6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avcodec: add a cook parser to get subpacket duration
  FATE: allow lavf tests to alter input parameters
  FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
  FATE: replace the acodec-g726 test with 4 new encode/decode tests
  FATE: replace current g722 encoding tests with an encode/decode test
  FATE: add a pattern rule for generating asynth wav files
  FATE: optionally write a WAVE header in audiogen
  avutil: add audio fifo buffer

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavutil/avutil.h
	tests/Makefile
	tests/codec-regression.sh
	tests/fate/voice.mak
	tests/lavf-regression.sh
	tests/ref/acodec/g722
	tests/ref/acodec/g726
	tests/ref/acodec/pcm_s24daud
	tests/ref/lavf/dv_fmt
	tests/ref/lavf/gxf
	tests/ref/lavf/mxf
	tests/ref/lavf/mxf_d10
	tests/ref/seek/lavf_dv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-20 22:18:26 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
libavdevice
libavfilter lavfi/mp: remove libmpcodecs mirror filter 2012-04-20 01:01:24 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
libpostproc
libswresample
libswscale
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: check encoder earlier. 2012-04-20 16:30:58 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
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.