1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 46a47077ee Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: add functions for testing code fragments
  af_amix: avoid spurious EAGAIN.
  af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.
  af_amix: only consider negative return codes as errors.
  avconv: use only meaningful timestamps in start time check.
  avconv: fix the check for -ss as an output option.
  mss3: add forgotten 'static' qualifier for private table
  lavc: options: add planar names for request_sample_fmt
  flacdec: add planar output support
  flvdec: Treat all nellymoser versions as the same codec

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-07 02:17:30 +02:00
doc cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-07-07 02:17:30 +02:00
libavdevice cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-07-07 02:17:30 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-07-07 02:17:30 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
libavutil cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swr/x86: 10l, missed some SSE2 instructions in code marked as SSE. 2012-07-05 15:28:10 +02:00
libswscale Fix destination row striding in altivec_yuv2_bgr24. 2012-07-06 17:40:43 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: increase fuzzyness for ac3 encode for 3dnow 2012-07-06 02:25:29 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c Extend -codecs output. 2012-07-05 16:46:19 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-07-07 02:17:30 +02:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c ffmpeg: poll filters even after -t limit. 2012-07-06 18:33:48 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
ffprobe.c cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
Makefile Makefile: remove checkheaders from the main check target 2012-06-29 00:05:40 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.